database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Mergine from mysql-next-me

Browse Source
This commit is contained in:
Alexander Barkov
2010-02-27 11:43:32 +04:00
parent da2e47a533 93287d6162
commit 06ca4ae33d
742 changed files with 345576 additions and 42390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmysqld/lib_sql.cc
View File

@ -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)