database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Added support for DROP TEMPORARY TABLE

Browse Source 
Removed mysql_warnings() API function.
Post merge fixes.
This commit is contained in:
monty@mashka.mysql.fi
2003-01-04 15:37:20 +02:00
parent 07daf3169e
commit 6d6f051178
13 changed files with 89 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_repl.cc
View File

@@ -757,7 +757,7 @@ int reset_slave(THD *thd, MASTER_INFO* mi)
err:
unlock_slave_threads(mi);
if (thd && error)
send_error(&thd->net, sql_errno, errmsg);
send_error(thd, sql_errno, errmsg);
DBUG_RETURN(error);
}
@@ -802,7 +802,7 @@ int change_master(THD* thd, MASTER_INFO* mi)
init_thread_mask(&thread_mask,mi,0 /*not inverse*/);
if (thread_mask) // We refuse if any slave thread is running
{
net_printf(&thd,ER_SLAVE_MUST_STOP);
net_printf(thd,ER_SLAVE_MUST_STOP);
unlock_slave_threads(mi);
DBUG_RETURN(1);
}
@@ -874,7 +874,7 @@ int change_master(THD* thd, MASTER_INFO* mi)
0 /* not only reset, but also reinit */,
&errmsg))
{
net_printf(&thd, 0, "Failed purging old relay logs: %s",errmsg);
net_printf(thd, 0, "Failed purging old relay logs: %s",errmsg);
unlock_slave_threads(mi);
DBUG_RETURN(1);
}
@@ -908,7 +908,7 @@ int change_master(THD* thd, MASTER_INFO* mi)
unlock_slave_threads(mi);
thd->proc_info = 0;
send_ok(&thd);
send_ok(thd);
DBUG_RETURN(0);
}