Commit 0b262a62 authored by unknown's avatar unknown
Browse files

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


mysql-test/t/sp.test:
  Tidying up after merge.
sql/mysqld.cc:
  Make sure we have thd->thread_stack set before calling store_globals().
  (And fixed compiler warning.)
sql/sql_class.cc:
  Init THD::tread_stack in constructor.
parent 07198336

mysql-test/t/sp.test

+2 −0
Original line number Diff line number Diff line
@@ -4773,6 +4773,8 @@ drop procedure bug10100pv| 
drop procedure bug10100pd|

drop procedure bug10100pc|

drop view v1|



#

# BUG#13729: Stored procedures: packet error after exception handled

#

--disable_warnings

sql/mysqld.cc

+4 −1
Original line number Diff line number Diff line
@@ -1589,6 +1589,7 @@ void end_thread(THD *thd, bool put_in_cache) 
      wake_thread--;

      thd=thread_cache.get();

      thd->real_id=pthread_self();

      thd->thread_stack= (char *) &thd;

      (void) thd->store_globals();

      thd->thr_create_time= time(NULL);

      threads.append(thd);
@@ -6912,8 +6913,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
  case OPT_MYISAM_STATS_METHOD:

  {

    ulong method_conv;

    myisam_stats_method_str= argument;

    int method;

    LINT_INIT(method_conv);



    myisam_stats_method_str= argument;

    if ((method=find_type(argument, &myisam_stats_method_typelib, 2)) <= 0)

    {

      fprintf(stderr, "Invalid value of myisam_stats_method: %s.\n", argument);

sql/sql_class.cc

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ THD::THD() 
   spcont(NULL)

{

  stmt_arena= this;

  thread_stack= 0;

  db= 0;

  catalog= (char*)"std"; // the only catalog we have for now

  main_security_ctx.init();