mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 23:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0

Browse source 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge


include/my_sys.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
This commit is contained in:
unknown 2008-01-31 16:15:46 +01:00
commit dc8e43edb5
53 changed files with 16548 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sql/set_var.cc
View file

@ -1448,6 +1448,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;
}