mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge next-mr -> next-4284.
mysql-test/t/disabled.def: Restore disabled ssl tests: SSL certificates were updated. Disable sp_sync.test, the test case can't work in next-4284. mysql-test/t/partition_innodb.test: Disable parsing of the test case for Bug#47343, the test can not work in next-4284. mysql-test/t/ps_ddl.test: Update results (CREATE TABLE IF NOT EXISTS takes into account existence of the temporary table).
This commit is contained in:
@ -117,8 +117,9 @@ int injector::transaction::write_row (server_id_type sid, table tbl,
|
||||
record_type record)
|
||||
{
|
||||
DBUG_ENTER("injector::transaction::write_row(...)");
|
||||
int error= 0;
|
||||
if (error= check_state(ROW_STATE))
|
||||
|
||||
int error= check_state(ROW_STATE);
|
||||
if (error)
|
||||
DBUG_RETURN(error);
|
||||
|
||||
server_id_type save_id= m_thd->server_id;
|
||||
@ -136,8 +137,8 @@ int injector::transaction::delete_row(server_id_type sid, table tbl,
|
||||
{
|
||||
DBUG_ENTER("injector::transaction::delete_row(...)");
|
||||
|
||||
int error= 0;
|
||||
if (error= check_state(ROW_STATE))
|
||||
int error= check_state(ROW_STATE);
|
||||
if (error)
|
||||
DBUG_RETURN(error);
|
||||
|
||||
server_id_type save_id= m_thd->server_id;
|
||||
@ -155,8 +156,8 @@ int injector::transaction::update_row(server_id_type sid, table tbl,
|
||||
{
|
||||
DBUG_ENTER("injector::transaction::update_row(...)");
|
||||
|
||||
int error= 0;
|
||||
if (error= check_state(ROW_STATE))
|
||||
int error= check_state(ROW_STATE);
|
||||
if (error)
|
||||
DBUG_RETURN(error);
|
||||
|
||||
server_id_type save_id= m_thd->server_id;
|
||||
|
Reference in New Issue
Block a user