diff options
| author | guilhem@mysql.com <> | 2003-12-04 22:42:18 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2003-12-04 22:42:18 +0100 |
| commit | dd2303ce072f185b02b50b58d841c70687f41bf9 (patch) | |
| tree | ca8ac74120edb9722c802f5ad77a4b4ecdae17d2 /sql/slave.cc | |
| parent | ae67b97c4bd6a94ba1d5fe38e2625fb4a0f0a274 (diff) | |
| download | mariadb-git-dd2303ce072f185b02b50b58d841c70687f41bf9.tar.gz | |
- Fix for BUG#1858 "SQL-Thread stops working when using optimize table":
we change THD::system_thread from a 'bool' to a bitmap to be able to
distinguish between delayed-insert threads and slave threads.
- Fix for BUG#1701 "Update from multiple tables" (one line in sql_parse.cc,
plus a new test rpl_multi_update.test). That's just adding an initialization.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 5bc31fd6a21..25eeb34e3a7 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2021,7 +2021,9 @@ improper_arguments: %d timed_out: %d", static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type) { DBUG_ENTER("init_slave_thread"); - thd->system_thread = thd->bootstrap = 1; + thd->system_thread = (thd_type == SLAVE_THD_SQL) ? + SYSTEM_THREAD_SLAVE_SQL : SYSTEM_THREAD_SLAVE_IO; + thd->bootstrap= 1; thd->host_or_ip= ""; thd->client_capabilities = 0; my_net_init(&thd->net, 0); |