diff options
| author | unknown <pem@mysql.com> | 2005-11-24 19:13:13 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-11-24 19:13:13 +0100 |
| commit | 0b262a6213a85ce3512facb23950145d051dca46 (patch) | |
| tree | bddfb76f3d2664bd556555b5970577cccced397d /sql/sql_class.cc | |
| parent | 07198336830a5d0e4a20223431ad16126275bd03 (diff) | |
| download | mariadb-git-0b262a6213a85ce3512facb23950145d051dca46.tar.gz | |
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.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index b65f353e492..70dfaca53d3 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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(); |