Commit faad8c74 authored by konstantin@mysql.com's avatar konstantin@mysql.com

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/kostja/mysql/mysql-4.0-root
parents feb7857d 3b9eb092
...@@ -2276,8 +2276,6 @@ static MYSQL* spawn_init(MYSQL* parent, const char* host, ...@@ -2276,8 +2276,6 @@ static MYSQL* spawn_init(MYSQL* parent, const char* host,
else if (parent->options.db) else if (parent->options.db)
child->options.db = my_strdup(parent->options.db, MYF(0)); child->options.db = my_strdup(parent->options.db, MYF(0));
child->options.rpl_parse = child->options.rpl_probe = child->rpl_pivot = 0;
return child; return child;
} }
...@@ -2291,9 +2289,6 @@ STDCALL mysql_set_master(MYSQL* mysql, const char* host, ...@@ -2291,9 +2289,6 @@ STDCALL mysql_set_master(MYSQL* mysql, const char* host,
mysql_close(mysql->master); mysql_close(mysql->master);
if (!(mysql->master = spawn_init(mysql, host, port, user, passwd))) if (!(mysql->master = spawn_init(mysql, host, port, user, passwd)))
return 1; return 1;
mysql->master->rpl_pivot = 0;
mysql->master->options.rpl_parse = 0;
mysql->master->options.rpl_probe = 0;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment