Merge next-mr -> next-4284.

This commit is contained in:
Konstantin Osipov 2009-12-16 11:33:54 +03:00
commit 980e8b413e
115 changed files with 82936 additions and 150166 deletions

View file

@ -119,7 +119,6 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
thd->current_stmt= stmt;
thd->store_globals(); // Fix if more than one connect
lex_start(thd);
/*
We have to call free_old_query before we start to fill mysql->fields
for new query. In the case of embedded server we collect field data