diff options
| author | Alexander Barkov <bar@mysql.com> | 2010-02-27 11:43:32 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2010-02-27 11:43:32 +0400 |
| commit | 7a83782f1caa102ebc552b017885f18f005425f0 (patch) | |
| tree | 79944b66b5194acfaac9f3ba322f1403d08f0080 /libmysqld/lib_sql.cc | |
| parent | 69904fa6584b383368c94b1531e1a1a8a57f43b5 (diff) | |
| parent | 6190282adb84a0b12829671ce9c4b98a7219c809 (diff) | |
| download | mariadb-git-7a83782f1caa102ebc552b017885f18f005425f0.tar.gz | |
Mergine from mysql-next-me
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 78e07110d7b..256c1e8fd40 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -118,6 +118,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, net_clear_error(net); thd->current_stmt= stmt; + thd->thread_stack= (char*) &thd; thd->store_globals(); // Fix if more than one connect /* We have to call free_old_query before we start to fill mysql->fields @@ -746,11 +747,6 @@ void THD::clear_data_list() cur_data= 0; } -void THD::clear_error() -{ - if (stmt_da->is_error()) - stmt_da->reset_diagnostics_area(); -} static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length, CHARSET_INFO *fromcs, CHARSET_INFO *tocs) |