diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 11:25:54 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 11:25:54 +0100 |
| commit | 206770562d2e3bd33599d5ea2aedfb31154c1487 (patch) | |
| tree | 09a25ebdb100cc9b38eef8149c29eae0b6daa411 /sql/set_var.cc | |
| parent | 4abbaf31df94131e9b44dbed535f745a45fa1eb4 (diff) | |
| parent | 7faa7d60aa3d7df5b0617103559d1e3df41dba0b (diff) | |
| download | mariadb-git-206770562d2e3bd33599d5ea2aedfb31154c1487.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
include/my_sys.h:
Auto merged
mysql-test/r/blackhole.result:
Auto merged
mysql-test/r/case.result:
Auto merged
mysql-test/r/mysqlbinlog2.result:
Auto merged
mysql-test/t/blackhole.test:
Auto merged
mysql-test/t/case.test:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index d0362edaa29..f4537fefbcc 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1449,6 +1449,7 @@ static void fix_trans_mem_root(THD *thd, enum_var_type type) static void fix_server_id(THD *thd, enum_var_type type) { server_id_supplied = 1; + thd->server_id= server_id; } |