database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
libmysql/libmysql.c:
  Auto merged
This commit is contained in:
unknown
2003-11-28 20:44:26 +02:00
parent c61299dc15 13f525c080
commit fd3847ce43
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libmysql/libmysql.c
View File

@ -807,8 +807,9 @@ static MYSQL* spawn_init(MYSQL* parent, const char* host,
const char* passwd) const char* passwd)
{ {
MYSQL* child; MYSQL* child;
DBUG_ENTER("spawn_init");
if (!(child= mysql_init(0))) if (!(child= mysql_init(0)))
return 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 :
@ -827,7 +828,12 @@ 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));
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);
} }