database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Some post-merge cleaning, and made assert THD::store_globals() work at all times.

Browse Source
This commit is contained in:
pem@mysql.com
2005-11-24 19:13:13 +01:00
parent eae8414d35
commit 23cab491e9
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/sp.test
View File

@@ -4773,6 +4773,8 @@ drop procedure bug10100pv|
drop procedure bug10100pd| drop procedure bug10100pd|
drop procedure bug10100pc| drop procedure bug10100pc|
drop view v1| drop view v1|
#
# BUG#13729: Stored procedures: packet error after exception handled # BUG#13729: Stored procedures: packet error after exception handled
# #
--disable_warnings --disable_warnings

5
sql/mysqld.cc
View File

@@ -1589,6 +1589,7 @@ void end_thread(THD *thd, bool put_in_cache)
wake_thread--; wake_thread--;
thd=thread_cache.get(); thd=thread_cache.get();
thd->real_id=pthread_self(); thd->real_id=pthread_self();
thd->thread_stack= (char *) &thd;
(void) thd->store_globals(); (void) thd->store_globals();
thd->thr_create_time= time(NULL); thd->thr_create_time= time(NULL);
threads.append(thd); threads.append(thd);
@@ -6912,8 +6913,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
case OPT_MYISAM_STATS_METHOD: case OPT_MYISAM_STATS_METHOD:
{ {
ulong method_conv; ulong method_conv;
myisam_stats_method_str= argument;
int method; int method;
LINT_INIT(method_conv);
myisam_stats_method_str= argument;
if ((method=find_type(argument, &myisam_stats_method_typelib, 2)) <= 0) if ((method=find_type(argument, &myisam_stats_method_typelib, 2)) <= 0)
{ {
fprintf(stderr, "Invalid value of myisam_stats_method: %s.\n", argument); fprintf(stderr, "Invalid value of myisam_stats_method: %s.\n", argument);

1
sql/sql_class.cc
View File

@@ -183,6 +183,7 @@ THD::THD()
spcont(NULL) spcont(NULL)
{ {
stmt_arena= this; stmt_arena= this;
thread_stack= 0;
db= 0; db= 0;
catalog= (char*)"std"; // the only catalog we have for now catalog= (char*)"std"; // the only catalog we have for now
main_security_ctx.init(); main_security_ctx.init();