mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 23:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Manual merge from mysql-trunk-merge.

Browse source
This commit is contained in:
Alexander Nozdrin 2009-10-14 12:25:39 +04:00
commit c30d924dd5
170 changed files with 7266 additions and 523 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libmysqld/lib_sql.cc
View file

@ -142,6 +142,8 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
if (!skip_check)
result= thd->is_error() ? -1 : 0;
thd->mysys_var= 0;
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
thd->profiling.finish_current_query();
#endif
@ -634,6 +636,7 @@ void *create_embedded_thd(int client_flag)
thread_count++;
threads.append(thd);
thd->mysys_var= 0;
return thd;
err:
delete(thd);