diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-07-02 17:37:23 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-07-02 17:37:23 -0400 |
| commit | 8c113acf966cb0dab9684d781323a34029e76700 (patch) | |
| tree | a2b49fdf472ff139ea37a0b778aae5c8b78ff47c /sql/sql_parse.cc | |
| parent | fd693194c9620078d61d77eae5e62fb4f5235942 (diff) | |
| parent | 71373afb5c48a27bde3e80a5207a14101d740cc8 (diff) | |
| download | mariadb-git-8c113acf966cb0dab9684d781323a34029e76700.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_672/mysql-4.0
client/mysqlbinlog.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 1ac4120187b..b2e1e56dc8f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1160,7 +1160,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, pos = uint4korr(packet); flags = uint2korr(packet + 4); thd->server_id=0; /* avoid suicide */ - kill_zombie_dump_threads(slave_server_id = uint4korr(packet+6)); + if ((slave_server_id= uint4korr(packet+6))) + kill_zombie_dump_threads(slave_server_id); thd->server_id = slave_server_id; mysql_binlog_send(thd, thd->strdup(packet + 10), (my_off_t) pos, flags); unregister_slave(thd,1,1); |