bk commit into 5.1 tree (tnurnberg:1.2379)

[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-17 21:32:08+01:00, tnurnberg@stripped +6 -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.2371.1.1

  mysql-test/r/func_time.result@stripped, 2006-11-17 21:31:59+01:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.87.1.1

  mysql-test/r/sp.result@stripped, 2006-11-17 21:31:59+01:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.233.1.1

  mysql-test/t/func_time.test@stripped, 2006-11-17 21:31:59+01:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.71.1.1

  mysql-test/t/sp.test@stripped, 2006-11-17 21:31:59+01:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.205.1.1

  sql/item_func.cc@stripped, 2006-11-17 21:32:00+01:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.333.1.1

  sql/sql_parse.cc@stripped, 2006-11-17 21:32:00+01:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.595.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.334/sql/item_func.cc	2006-11-16 15:13:21 +01:00
+++ 1.335/sql/item_func.cc	2006-11-17 21:32:00 +01:00
@@ -5003,7 +5003,7 @@ Item_func_sp::execute_impl(THD *thd, Fie
     Throw an error if a non-deterministic function is called while
     statement-based replication (SBR) is active.
   */
-  if (!m_sp->m_chistics->detistic &&
+  if (!m_sp->m_chistics->detistic && !trust_function_creators &&
       (mysql_bin_log.is_open() &&
        thd->variables.binlog_format == BINLOG_FORMAT_STMT))
   {

--- 1.596/sql/sql_parse.cc	2006-11-16 15:13:22 +01:00
+++ 1.597/sql/sql_parse.cc	2006-11-17 21:32:00 +01:00
@@ -4576,18 +4576,6 @@ 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.88/mysql-test/r/func_time.result	2006-11-16 13:15:27 +01:00
+++ 1.89/mysql-test/r/func_time.result	2006-11-17 21:31:59 +01:00
@@ -1060,6 +1060,7 @@ Note	1003	select timestampdiff(WEEK,_lat
 select time_format('100:00:00', '%H %k %h %I %l');
 time_format('100:00:00', '%H %k %h %I %l')
 100 100 04 04 4
+SET GLOBAL log_bin_trust_function_creators = 1;
 create table t1 (a timestamp default '2005-05-05 01:01:01',
 b timestamp default '2005-05-05 01:01:01');
 drop function if exists t_slow_sysdate;
@@ -1083,6 +1084,7 @@ a != b
 drop trigger t_before;
 drop function t_slow_sysdate;
 drop table t1;
+SET GLOBAL log_bin_trust_function_creators = 0;
 create table t1 (a datetime, i int, b datetime);
 insert into t1 select sysdate(), sleep(1), sysdate() from dual;
 select a != b from t1;

--- 1.72/mysql-test/t/func_time.test	2006-11-16 13:11:15 +01:00
+++ 1.73/mysql-test/t/func_time.test	2006-11-17 21:31:59 +01:00
@@ -586,6 +586,8 @@ select time_format('100:00:00', '%H %k %
 # Bug #12562: Make SYSDATE behave like it does in Oracle: always the current
 #             time, regardless of magic to make NOW() always the same for the
 #             entirety of a statement.
+SET GLOBAL log_bin_trust_function_creators = 1;
+
 create table t1 (a timestamp default '2005-05-05 01:01:01',
                  b timestamp default '2005-05-05 01:01:01');
 delimiter //;
@@ -614,6 +616,8 @@ select a != b from t1;
 drop trigger t_before;
 drop function t_slow_sysdate;
 drop table t1;
+
+SET GLOBAL log_bin_trust_function_creators = 0;
 
 create table t1 (a datetime, i int, b datetime);
 insert into t1 select sysdate(), sleep(1), sysdate() from dual;

--- 1.235/mysql-test/r/sp.result	2006-11-16 15:13:21 +01:00
+++ 1.236/mysql-test/r/sp.result	2006-11-17 21:31:59 +01:00
@@ -243,7 +243,7 @@ set x = (select sum(t.i) from test.t2 t)
 insert into test.t1 values (id, x);
 end|
 drop procedure if exists sub3|
-create function sub3(i int) returns int
+create function sub3(i int) returns int deterministic
 return i+1|
 call sub1("sub1a", (select 7))|
 call sub1("sub1b", (select max(i) from t2))|

--- 1.206/mysql-test/t/sp.test	2006-11-16 15:13:21 +01:00
+++ 1.207/mysql-test/t/sp.test	2006-11-17 21:31:59 +01:00
@@ -358,7 +358,7 @@ end|
 --disable_warnings
 drop procedure if exists sub3|
 --enable_warnings
-create function sub3(i int) returns int
+create function sub3(i int) returns int deterministic
   return i+1|
 
 call sub1("sub1a", (select 7))|