mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Added support for DROP TEMPORARY TABLE
Removed mysql_warnings() API function. Post merge fixes. client/mysqltest.c: Don't use mysql_warnings(). include/mysql.h: Removed mysql_warnings() API function libmysql/libmysql.c: Removed mysql_warnings() API function mysql-test/r/rpl_log_pos.result: Updated results mysql-test/t/connect.test: Removed empty lines mysql-test/t/rpl_log_pos.test: Update to new syntax sql/item.h: Fix after merge sql/item_create.cc: Fix after merge sql/mysql_priv.h: Added support for DROP TEMPORARY TABLE sql/sql_db.cc: Added support for DROP TEMPORARY TABLE sql/sql_parse.cc: SHOW WARNINGS now shows notes, warnings and errors. Support for DROP TEMPORARY TABLE Post merge fixes sql/sql_repl.cc: Post merge fixes sql/sql_table.cc: Added support for DROP TEMPORARY TABLE
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user