diff options
| author | vva@eagle.mysql.r18.ru <> | 2003-04-03 20:26:13 -0400 |
|---|---|---|
| committer | vva@eagle.mysql.r18.ru <> | 2003-04-03 20:26:13 -0400 |
| commit | f237ae457a0adc6daaeebb49293da435ef673076 (patch) | |
| tree | 698b731a6a81a9527eddab517b98e52663da1deb | |
| parent | e96c75fec073db2ef9af59c01634551ed9ea5fd4 (diff) | |
| download | mariadb-git-f237ae457a0adc6daaeebb49293da435ef673076.tar.gz | |
fux bug #183
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/slave.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index a6699f7c515..705b336440b 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -35,5 +35,6 @@ serg@build.mysql2.com serg@serg.mysql.com serg@sergbook.mysql.com sinisa@rhols221.adsl.netsonic.fi +vva@eagle.mysql.r18.ru walrus@mysql.com zak@balfor.local diff --git a/sql/slave.cc b/sql/slave.cc index ac65bd2bdc3..acc443b2296 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1139,7 +1139,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) List<Item> fields; lev->set_fields(fields); - thd->slave_proxy_id = thd->thread_id; + thd->slave_proxy_id = thread_id; thd->net.vio = net->vio; // mysql_load will use thd->net to read the file thd->net.pkt_nr = net->pkt_nr; |