diff options
| author | konstantin@mysql.com <> | 2005-11-23 21:20:31 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2005-11-23 21:20:31 +0300 |
| commit | 6fab184f30dad1cef648a099b2ea87330626bc2f (patch) | |
| tree | fbc181c37c03bc1c6c29d487df66847a1d4cda78 /sql/sql_class.cc | |
| parent | d50e8ea2274ddb14850ffbefa444cdaac2f733c8 (diff) | |
| parent | b1d951d4626cb70375c262de9ba4a67a24d85e57 (diff) | |
| download | mariadb-git-6fab184f30dad1cef648a099b2ea87330626bc2f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index a0d87b05e97..b65f353e492 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -517,6 +517,12 @@ void THD::awake(THD::killed_state state_to_set) bool THD::store_globals() { + /* + Assert that thread_stack is initialized: it's necessary to be able + to track stack overrun. + */ + DBUG_ASSERT(this->thread_stack); + if (my_pthread_setspecific_ptr(THR_THD, this) || my_pthread_setspecific_ptr(THR_MALLOC, &mem_root)) return 1; |