1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1

This commit is contained in:
monty@mysql.com
2003-11-28 20:44:26 +02:00

View File

@@ -807,8 +807,9 @@ static MYSQL* spawn_init(MYSQL* parent, const char* host,
const char* passwd)
{
MYSQL* child;
DBUG_ENTER("spawn_init");
if (!(child= mysql_init(0)))
return 0;
DBUG_RETURN(0);
child->options.user= my_strdup((user) ? user :
(parent->user ? parent->user :
@@ -827,7 +828,12 @@ static MYSQL* spawn_init(MYSQL* parent, const char* host,
else if (parent->options.db)
child->options.db= my_strdup(parent->options.db, MYF(0));
return child;
/*
rpl_pivot is set to 1 in mysql_init(); Reset it as we are not doing
replication here
*/
child->rpl_pivot= 0;
DBUG_RETURN(child);
}