database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

Browse Source 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456
This commit is contained in:
tnurnberg@salvation.intern.azundris.com
2006-11-15 15:47:29 +01:00
parent 46a599d868 c5c46ca483
commit 95fabc6522
4 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_parse.cc
View File

@@ -4576,6 +4576,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)