mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR"
calling (rather than defining) non-deterministic SP in SBR (as opposed to RBR or mixed) will throw an error now. require mixed mode for tests now. SBR will now fail when calling non-deter SPs and SFs (as it should), and RBR already failed by virtue of giving different results for "show binlog" than the results-file has. also test for 16456 now. lastly make amends because one of the tests fails with a new error # now as code was added to sql_trigger.cc while test was disabled.
This commit is contained in:
parent
0d9046ca27
commit
ea3bf1b247
@@ -4546,6 +4546,18 @@ end_with_restore_list:
|
||||
goto error;
|
||||
}
|
||||
|
||||
/*
|
||||
Throw an error if a non-deterministic procedure is called while
|
||||
statement-based replication (SBR) is active.
|
||||
*/
|
||||
if (!sp->m_chistics->detistic &&
|
||||
(mysql_bin_log.is_open() &&
|
||||
thd->variables.binlog_format == BINLOG_FORMAT_STMT))
|
||||
{
|
||||
my_error(ER_BINLOG_ROW_RBR_TO_SBR, MYF(0));
|
||||
goto error;
|
||||
}
|
||||
|
||||
my_bool nsok= thd->net.no_send_ok;
|
||||
thd->net.no_send_ok= TRUE;
|
||||
if (sp->m_flags & sp_head::MULTI_RESULTS)
|
||||
|
||||
Reference in New Issue
Block a user