bk commit into 5.1 tree (tnurnberg:1.2361)

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.1 repository of tnurnberg. When tnurnberg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-15 01:58:11+01:00, tnurnberg@stripped +5 -0
  Merge tnurnberg@stripped:/home/bk/mysql-5.1-maint
  into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456
  MERGE: 1.2273.162.1

  mysql-test/mysql-test-run.pl@stripped, 2006-11-15 01:57:45+01:00, tnurnberg@stripped +1 -5
    MERGE: 1.198.1.1

  mysql-test/r/func_time.result@stripped, 2006-11-15 01:40:04+01:00, tnurnberg@stripped +0 -1
    Auto merged
    MERGE: 1.80.1.3

  mysql-test/t/disabled.def@stripped, 2006-11-15 01:40:04+01:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.208.1.1

  sql/item_func.cc@stripped, 2006-11-15 01:40:04+01:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.322.1.1

  sql/sql_parse.cc@stripped, 2006-11-15 01:40:04+01:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.586.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tnurnberg
# Host:	salvation.intern.azundris.com
# Root:	/home/tnurnberg/work/mysql-5.1-maint-16456/RESYNC

--- 1.330/sql/item_func.cc	2006-11-13 19:19:45 +01:00
+++ 1.331/sql/item_func.cc	2006-11-15 01:40:04 +01:00
@@ -4996,6 +4996,18 @@ Item_func_sp::execute_impl(THD *thd, Fie
     goto error;
 
   /*
+    Throw an error if a non-deterministic function is called while
+    statement-based replication (SBR) is active.
+  */
+  if (!m_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;
+  }
+
+  /*
     Disable the binlogging if this is not a SELECT statement. If this is a
     SELECT, leave binlogging on, so execute_function() code writes the
     function call into binlog.

--- 1.593/sql/sql_parse.cc	2006-11-07 14:24:33 +01:00
+++ 1.594/sql/sql_parse.cc	2006-11-15 01:40:04 +01:00
@@ -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)

--- 1.210/mysql-test/t/disabled.def	2006-11-04 09:32:33 +01:00
+++ 1.211/mysql-test/t/disabled.def	2006-11-15 01:40:04 +01:00
@@ -25,7 +25,6 @@ rpl_ndb_ddl              : BUG#18946 res
 rpl_ndb_innodb2ndb       : Bug #19710  Cluster replication to partition table fails on DELETE FROM statement
 rpl_ndb_myisam2ndb       : Bug #19710  Cluster replication to partition table fails on DELETE FROM statement
 rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
-rpl_sp                   : BUG#16456 2006-02-16 jmiller
 rpl_multi_engine         : BUG#22583 2006-09-23 lars
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open