Merge ramayana.hindu.god:/home/tsmith/m/bk/51

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51

mysql-test/include/rpl_udf.inc

@@ -35,7 +35,7 @@ eval CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "$UDF_EXAMPLE_LIB";
 --error ER_CANT_FIND_DL_ENTRY
 eval CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "$UDF_EXAMPLE_LIB";
 --replace_column 3 UDF_LIB
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 --disable_info
 
 save_master_pos;
@@ -46,7 +46,7 @@ sync_with_master;
 --echo "Running on the slave"
 --enable_info
 --replace_column 3 UDF_LIB
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 --disable_info
 
 connection master;
@@ -81,7 +81,7 @@ connection master;
 --enable_info
 DROP FUNCTION myfunc_double;
 DROP FUNCTION myfunc_int;
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 --disable_info
 
 sync_slave_with_master;
@@ -89,7 +89,7 @@ sync_slave_with_master;
 # Check to see if the UDFs were dropped on the slave
 --echo "Running on the slave"
 --enable_info
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 --disable_info
 
 connection master;
@@ -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 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 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 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 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 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 name;
 --disable_info
 
 connection master;

mysql-test/suite/rpl/r/rpl_udf.result

@@ -14,13 +14,13 @@ CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
 affected rows: 0
 CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
 ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 myfunc_double	1	UDF_LIB	function
 myfunc_int	2	UDF_LIB	function
 affected rows: 2
 "Running on the slave"
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 myfunc_double	1	UDF_LIB	function
 myfunc_int	2	UDF_LIB	function
@@ -64,11 +64,11 @@ DROP FUNCTION myfunc_double;
 affected rows: 0
 DROP FUNCTION myfunc_int;
 affected rows: 0
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 affected rows: 0
 "Running on the slave"
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 affected rows: 0
 "Running on the master"
@@ -80,13 +80,13 @@ CREATE FUNCTION myfuncsql_int(i INT) RETURNS INTEGER DETERMINISTIC RETURN i;
 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 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 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	
@@ -122,13 +122,13 @@ ALTER FUNCTION myfuncsql_int COMMENT "This was altered.";
 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 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 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.
@@ -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 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 name;
 db	name	type	param_list	body	comment
 affected rows: 0
 "Running on the master"
@@ -166,16 +166,16 @@ CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
 affected rows: 0
 CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
 ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
-myfunc_int	2	UDF_LIB	function
 myfunc_double	1	UDF_LIB	function
+myfunc_int	2	UDF_LIB	function
 affected rows: 2
 "Running on the slave"
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
-myfunc_int	2	UDF_LIB	function
 myfunc_double	1	UDF_LIB	function
+myfunc_int	2	UDF_LIB	function
 affected rows: 2
 "Running on the master"
 CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;
@@ -224,11 +224,11 @@ DROP FUNCTION myfunc_double;
 affected rows: 0
 DROP FUNCTION myfunc_int;
 affected rows: 0
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 affected rows: 0
 "Running on the slave"
-SELECT * FROM mysql.func;
+SELECT * FROM mysql.func ORDER BY name;
 name	ret	dl	type
 affected rows: 0
 "Running on the master"
@@ -240,13 +240,13 @@ CREATE FUNCTION myfuncsql_int(i INT) RETURNS INTEGER DETERMINISTIC RETURN i;
 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 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 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 "This was altered.";
 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 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 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 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 name;
 db	name	type	param_list	body	comment
 affected rows: 0
 "Running on the master"