diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-04-17 15:17:01 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-04-17 15:17:01 +0200 |
| commit | 0e7410a154560486ce4e0c975f122a0b15853bb1 (patch) | |
| tree | e65ba67f602f6c99a52a1953b2172043476a5930 /sql/sql_parse.cc | |
| parent | f398ced7f05e64b0f2bdb8e0a70de907aff9e1eb (diff) | |
| parent | 30b2c64c4e87f8924fe817f5c607ae90a990e9e5 (diff) | |
| download | mariadb-git-0e7410a154560486ce4e0c975f122a0b15853bb1.tar.gz | |
Merge 10.0-base -> 10.0 (GTID).
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index e8268f42cc7..589c1a3b7b9 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1463,10 +1463,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd, /* TODO: The following has to be changed to an 8 byte integer */ pos = uint4korr(packet); flags = uint2korr(packet + 4); - thd->server_id=0; /* avoid suicide */ + thd->variables.server_id=0; /* avoid suicide */ if ((slave_server_id= uint4korr(packet+6))) // mysqlbinlog.server_id==0 kill_zombie_dump_threads(slave_server_id); - thd->server_id = slave_server_id; + thd->variables.server_id = slave_server_id; general_log_print(thd, command, "Log: '%s' Pos: %ld", packet+10, (long) pos); |