database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

rpl_parse and rpl_probe don't have to be reset as they are already 0

Browse Source
This commit is contained in:
unknown
2003-11-28 20:41:33 +02:00
parent 90fc2b973a
commit 13f525c080
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
libmysql/libmysql.c
View File

@ -2256,29 +2256,33 @@ static MYSQL* spawn_init(MYSQL* parent, const char* host,
const char* passwd) const char* passwd)
{ {
MYSQL* child; MYSQL* child;
if (!(child = mysql_init(0))) DBUG_ENTER("spawn_init");
return 0; if (!(child= mysql_init(0)))
DBUG_RETURN(0);
child->options.user = my_strdup((user) ? user : child->options.user= my_strdup((user) ? user :
(parent->user ? parent->user : (parent->user ? parent->user :
parent->options.user), MYF(0)); parent->options.user), MYF(0));
child->options.password = my_strdup((passwd) ? passwd : child->options.password= my_strdup((passwd) ? passwd :
(parent->passwd ? (parent->passwd ?
parent->passwd : parent->passwd :
parent->options.password), MYF(0)); parent->options.password), MYF(0));
child->options.port = port; child->options.port= port;
child->options.host = my_strdup((host) ? host : child->options.host= my_strdup((host) ? host :
(parent->host ? (parent->host ?
parent->host : parent->host :
parent->options.host), MYF(0)); parent->options.host), MYF(0));
if (parent->db) if (parent->db)
child->options.db = my_strdup(parent->db, MYF(0)); child->options.db= my_strdup(parent->db, MYF(0));
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; /*
rpl_pivot is set to 1 in mysql_init(); Reset it as we are not doing
return child; replication here
*/
child->rpl_pivot= 0;
DBUG_RETURN(child);
} }