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

merge from latest 5.1

Browse Source
This commit is contained in:
Guilhem Bichot
2011-05-21 10:43:54 +02:00
parent 25221cccd2 967cf75819
commit 15e69738d9
10 changed files with 286 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_class.cc
View File

@ -1195,6 +1195,25 @@ bool THD::store_globals()
return 0;
}
/*
Remove the thread specific info (THD and mem_root pointer) stored during
store_global call for this thread.
*/
bool THD::restore_globals()
{
/*
Assert that thread_stack is initialized: it's necessary to be able
to track stack overrun.
*/
DBUG_ASSERT(thread_stack);
/* Undocking the thread specific data. */
my_pthread_setspecific_ptr(THR_THD, NULL);
my_pthread_setspecific_ptr(THR_MALLOC, NULL);
return 0;
}
/*
Cleanup after query.