diff options
| author | unknown <konstantin@mysql.com> | 2005-11-23 21:18:10 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-11-23 21:18:10 +0300 |
| commit | 0633a41c154fdf4f38880072b6f9356b2d6c2bd8 (patch) | |
| tree | 82cf7863e471a48c80281113d66a428d0a2c3a1c /sql/slave.cc | |
| parent | 4aea839bde48c615d2d672ebbd29f20c297fe670 (diff) | |
| download | mariadb-git-0633a41c154fdf4f38880072b6f9356b2d6c2bd8.tar.gz | |
Always initialize THD::thread_stack: it's used in
check_stack_overrun().
sql/slave.cc:
Move initialization of THD::thread_stack before THD::store_globals()
sql/sql_acl.cc:
Initialize THD::thread_stack in artificial THDs used
to load gratns subsystem.
sql/sql_class.cc:
Add an assert that THD::thread_stack is assigned.
sql/sql_insert.cc:
Add initialization of THD::thread_stack (delayed insert
thread).
sql/sql_parse.cc:
Move initialization of THD::thread_stack before
THD::store_globals().
sql/sql_udf.cc:
Add initialization for THD::thread_stack (an artificial
THD used to initialize UDF subsystem).
sql/tztime.cc:
Add initialization for THD::thread_stack (an artificial
THD used to initialize timezones).
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 065d9c787ce..5e1c838730c 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3446,6 +3446,7 @@ slave_begin: THD_CHECK_SENTRY(thd); pthread_detach_this_thread(); + thd->thread_stack= (char*) &thd; // remember where our stack is if (init_slave_thread(thd, SLAVE_THD_IO)) { pthread_cond_broadcast(&mi->start_cond); @@ -3454,7 +3455,6 @@ slave_begin: goto err; } mi->io_thd = thd; - thd->thread_stack = (char*)&thd; // remember where our stack is pthread_mutex_lock(&LOCK_thread_count); threads.append(thd); pthread_mutex_unlock(&LOCK_thread_count); |