bk commit into 5.2 tree (istruewing:1.2569)

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
5.2 repository of istruewing. When istruewing 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, 2007-08-06 22:23:28+02:00, istruewing@stripped +2 -0
  Post-merge fix
  Made result deterministic by ORDER BY.

  mysql-test/include/rpl_udf.inc@stripped, 2007-08-06 22:23:24+02:00, istruewing@stripped
+6 -6
    Post-merge fix
    Made result deterministic by ORDER BY.

  mysql-test/suite/rpl/r/rpl_udf.result@stripped, 2007-08-06 22:23:24+02:00,
istruewing@stripped +16 -16
    Post-merge fix
    Made result deterministic by ORDER BY.

diff -Nrup a/mysql-test/include/rpl_udf.inc b/mysql-test/include/rpl_udf.inc
--- a/mysql-test/include/rpl_udf.inc	2007-03-30 14:05:26 +02:00
+++ b/mysql-test/include/rpl_udf.inc	2007-08-06 22:23:24 +02:00
@@ -108,7 +108,7 @@ DROP TABLE t1;
 --enable_info
 CREATE FUNCTION myfuncsql_int(i INT) RETURNS INTEGER DETERMINISTIC RETURN i; 
 CREATE FUNCTION myfuncsql_double(d DOUBLE) RETURNS INTEGER DETERMINISTIC RETURN d * 2.00;

-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 --disable_info
 
 sync_slave_with_master;
@@ -116,7 +116,7 @@ sync_slave_with_master;
 # Check to see that UDF CREATE statements were replicated
 --echo "Running on the slave"
 --enable_info
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 --disable_info
 
 connection master;
@@ -147,7 +147,7 @@ connection master;
 --enable_info
 ALTER FUNCTION myfuncsql_int COMMENT "This was altered.";
 ALTER FUNCTION myfuncsql_double COMMENT "This was altered.";
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 --disable_info
 
 sync_slave_with_master;
@@ -155,7 +155,7 @@ sync_slave_with_master;
 # Check to see if data was replicated
 --echo "Running on the slave"
 --enable_info
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 
 # Check to see that the functions are available for execution on the slave
 SELECT myfuncsql_int(25);
@@ -169,7 +169,7 @@ connection master;
 --enable_info
 DROP FUNCTION myfuncsql_double;
 DROP FUNCTION myfuncsql_int;
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 --disable_info
 
 sync_slave_with_master;
@@ -177,7 +177,7 @@ sync_slave_with_master;
 # Check to see if the UDFs were dropped on the slave
 --echo "Running on the slave"
 --enable_info
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 --disable_info
 
 connection master;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_udf.result b/mysql-test/suite/rpl/r/rpl_udf.result
--- a/mysql-test/suite/rpl/r/rpl_udf.result	2007-08-03 17:44:48 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_udf.result	2007-08-06 22:23:24 +02:00
@@ -80,16 +80,16 @@ CREATE FUNCTION myfuncsql_int(i INT) RET
 affected rows: 0
 CREATE FUNCTION myfuncsql_double(d DOUBLE) RETURNS INTEGER DETERMINISTIC RETURN d * 2.00;
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
-test	myfuncsql_int	FUNCTION	i INT	RETURN i	
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	
+test	myfuncsql_int	FUNCTION	i INT	RETURN i	
 affected rows: 2
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
-test	myfuncsql_int	FUNCTION	i INT	RETURN i	
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	
+test	myfuncsql_int	FUNCTION	i INT	RETURN i	
 affected rows: 2
 "Running on the master"
 CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;
@@ -122,16 +122,16 @@ ALTER FUNCTION myfuncsql_int COMMENT "Th
 affected rows: 0
 ALTER FUNCTION myfuncsql_double COMMENT "This was altered.";
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
-test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	This was altered.
+test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
 affected rows: 2
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
-test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	This was altered.
+test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
 affected rows: 2
 SELECT myfuncsql_int(25);
 myfuncsql_int(25)
@@ -146,11 +146,11 @@ DROP FUNCTION myfuncsql_double;
 affected rows: 0
 DROP FUNCTION myfuncsql_int;
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
 affected rows: 0
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
 affected rows: 0
 "Running on the master"
@@ -240,13 +240,13 @@ CREATE FUNCTION myfuncsql_int(i INT) RET
 affected rows: 0
 CREATE FUNCTION myfuncsql_double(d DOUBLE) RETURNS INTEGER DETERMINISTIC RETURN d * 2.00;
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	
 affected rows: 2
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	
@@ -282,13 +282,13 @@ ALTER FUNCTION myfuncsql_int COMMENT "Th
 affected rows: 0
 ALTER FUNCTION myfuncsql_double COMMENT "This was altered.";
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	This was altered.
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
 affected rows: 2
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	This was altered.
 test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
@@ -306,11 +306,11 @@ DROP FUNCTION myfuncsql_double;
 affected rows: 0
 DROP FUNCTION myfuncsql_int;
 affected rows: 0
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
 affected rows: 0
 "Running on the slave"
-SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%';
+SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND
name LIKE 'myfuncsql%' ORDER BY db, name;
 db	name	type	param_list	body	comment
 affected rows: 0
 "Running on the master"