bk commit into 5.1 tree (msvensson:1.2163)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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
  1.2163 06/05/18 20:21:43 msvensson@shellback.(none) +3 -0
  Merge bk-internal:/home/bk/mysql-5.1-new
  into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

  mysql-test/t/sp.test
    1.190 06/05/18 20:21:31 msvensson@shellback.(none) +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.207 06/05/18 20:21:31 msvensson@shellback.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.116 06/05/18 20:21:30 msvensson@shellback.(none) +0 -0
    Auto merged

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.115/mysql-test/mysql-test-run.pl	2006-05-18 10:53:09 +02:00
+++ 1.116/mysql-test/mysql-test-run.pl	2006-05-18 20:21:30 +02:00
@@ -876,6 +876,7 @@
    start_timeout =>  400, # enough time create innodb tables
 
    ndbcluster    =>  1, # ndbcluster not started
+   master_opt    => [],
   };
 
   $master->[1]=
@@ -2143,6 +2144,14 @@
     {
       $do_restart= 1;
     }
+    # Check that running master was started with same options
+    # as the current test requires
+    elsif (! mtr_same_opts($master->[0]->{'master_opt'},
+			   $tinfo->{'master_opt'}) )
+    {
+      $do_restart= 1;
+    }
+
 
     if ( $do_restart )
     {
@@ -2222,6 +2231,8 @@
           report_failure_and_restart($tinfo);
           return;
         }
+	# Remember options used to start
+	$master->[0]->{'master_opt'}= $tinfo->{'master_opt'};
       }
       if ( $using_ndbcluster_master and ! $master->[1]->{'pid'} )
       {

--- 1.206/mysql-test/r/sp.result	2006-05-18 13:35:11 +02:00
+++ 1.207/mysql-test/r/sp.result	2006-05-18 20:21:31 +02:00
@@ -4796,22 +4796,6 @@
 0
 drop table t3|
 drop procedure bug16887|
-create table t3 (f1 int, f2 varchar(3), primary key(f1)) engine=innodb|
-insert into t3 values (1,'aaa'),(2,'bbb'),(3,'ccc')|
-CREATE FUNCTION bug13575 ( p1 integer ) 
-returns varchar(3) 
-BEGIN 
-DECLARE v1 VARCHAR(10) DEFAULT null;
-SELECT f2 INTO v1 FROM t3 WHERE f1 = p1; 
-RETURN v1;
-END|
-select distinct f1, bug13575(f1) from t3 order by f1|
-f1	bug13575(f1)
-1	aaa
-2	bbb
-3	ccc
-drop function bug13575;
-drop table t3|
 drop procedure if exists bug16474_1|
 drop procedure if exists bug16474_2|
 delete from t1|

--- 1.189/mysql-test/t/sp.test	2006-05-18 10:53:09 +02:00
+++ 1.190/mysql-test/t/sp.test	2006-05-18 20:21:31 +02:00
@@ -5637,23 +5637,6 @@
 drop procedure bug16887|
 
 #
-# Bug#13575 SP funcs in select with distinct/group and order by can
-#           produce bad data
-#
-create table t3 (f1 int, f2 varchar(3), primary key(f1)) engine=innodb|
-insert into t3 values (1,'aaa'),(2,'bbb'),(3,'ccc')|
-CREATE FUNCTION bug13575 ( p1 integer ) 
-returns varchar(3) 
-BEGIN 
-DECLARE v1 VARCHAR(10) DEFAULT null;
-SELECT f2 INTO v1 FROM t3 WHERE f1 = p1; 
-RETURN v1;
-END|
-select distinct f1, bug13575(f1) from t3 order by f1|
-drop function bug13575;
-drop table t3|
-
-#
 # BUG#16474: SP crashed MySQL
 # (when using "order by localvar", where 'localvar' is just that.
 #