Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix sizeof size
This commit is contained in:
Stanislav Malyshev 2015-02-01 12:41:33 -08:00
commit 969e389121

View File

@ -626,7 +626,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s
conn->current_result = NULL;
} else {
stmt->result = NULL;
memset(stmt, 0, sizeof(MYSQLND_STMT));
memset(stmt, 0, sizeof(*stmt));
stmt->state = MYSQLND_STMT_INITTED;
}
} else {