List:Commits« Previous MessageNext Message »
From:Chad MILLER Date:December 17 2007 2:51pm
Subject:bk commit into 5.1 tree (cmiller:1.2497)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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-12-17 08:51:29-05:00, cmiller@stripped +3 -0
  Order results to be deterministic.
  
  Follow SergG's lead with mysqlcheck result.

  mysql-test/r/mysqlcheck.result@stripped, 2007-12-17 08:51:26-05:00,
cmiller@stripped +2 -1
    Error changed lately.  This may not be a bug, despite Bug#29458.
    
    See SergG [22 Nov 11:45] comment for Bug#25347.

  mysql-test/suite/rpl/r/rpl_invoked_features.result@stripped, 2007-12-17 08:51:26-05:00,
cmiller@stripped +12 -12
    Order so it is deterministic.

  mysql-test/suite/rpl/t/rpl_invoked_features.test@stripped, 2007-12-17 08:51:26-05:00,
cmiller@stripped +8 -8
    Order so it is deterministic.

diff -Nrup a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
--- a/mysql-test/r/mysqlcheck.result	2007-12-14 13:42:04 -05:00
+++ b/mysql-test/r/mysqlcheck.result	2007-12-17 08:51:26 -05:00
@@ -70,7 +70,8 @@ insert into t_bug25347 values (1),(2),(3
 flush tables;
 removing and creating
 d_bug25347.t_bug25347
-error    : Incorrect file format 't_bug25347'
+Error    : Incorrect file format 't_bug25347'
+error    : Corrupt
 insert into t_bug25347 values (4),(5),(6);
 ERROR HY000: Incorrect file format 't_bug25347'
 d_bug25347.t_bug25347
diff -Nrup a/mysql-test/suite/rpl/r/rpl_invoked_features.result
b/mysql-test/suite/rpl/r/rpl_invoked_features.result
--- a/mysql-test/suite/rpl/r/rpl_invoked_features.result	2007-08-27 10:44:03 -04:00
+++ b/mysql-test/suite/rpl/r/rpl_invoked_features.result	2007-12-17 08:51:26 -05:00
@@ -116,23 +116,23 @@ t12
 t13
 t2
 t3
-SELECT table_name FROM information_schema.views WHERE table_schema='test';
+SELECT table_name FROM information_schema.views WHERE table_schema='test' order by
table_name;
 table_name
 v1
 v11
-SELECT trigger_name, event_manipulation, event_object_table FROM
information_schema.triggers WHERE trigger_schema='test';
+SELECT trigger_name, event_manipulation, event_object_table FROM
information_schema.triggers WHERE trigger_schema='test' order by trigger_name;
 trigger_name	event_manipulation	event_object_table
-t1_tr1	INSERT	t1
-t1_tr2	UPDATE	t1
 t11_tr1	INSERT	t11
 t11_tr2	UPDATE	t11
-SELECT routine_type, routine_name FROM information_schema.routines WHERE
routine_schema='test';
+t1_tr1	INSERT	t1
+t1_tr2	UPDATE	t1
+SELECT routine_type, routine_name FROM information_schema.routines WHERE
routine_schema='test' order by routine_name;
 routine_type	routine_name
 FUNCTION	f1
 FUNCTION	f2
 PROCEDURE	p1
 PROCEDURE	p11
-SELECT event_name, status FROM information_schema.events WHERE event_schema='test';
+SELECT event_name, status FROM information_schema.events WHERE event_schema='test' order
by event_name;
 event_name	status
 e1	DISABLED
 e11	DISABLED
@@ -276,23 +276,23 @@ t12
 t13
 t2
 t3
-SELECT table_name FROM information_schema.views WHERE table_schema='test';
+SELECT table_name FROM information_schema.views WHERE table_schema='test' order by
table_name;
 table_name
 v1
 v11
-SELECT trigger_name, event_manipulation, event_object_table FROM
information_schema.triggers WHERE trigger_schema='test';
+SELECT trigger_name, event_manipulation, event_object_table FROM
information_schema.triggers WHERE trigger_schema='test' order by trigger_name;
 trigger_name	event_manipulation	event_object_table
-t1_tr1	INSERT	t1
-t1_tr2	UPDATE	t1
 t11_tr1	INSERT	t11
 t11_tr2	UPDATE	t11
-SELECT routine_type, routine_name FROM information_schema.routines WHERE
routine_schema='test';
+t1_tr1	INSERT	t1
+t1_tr2	UPDATE	t1
+SELECT routine_type, routine_name FROM information_schema.routines WHERE
routine_schema='test' order by routine_name;
 routine_type	routine_name
 FUNCTION	f1
 FUNCTION	f2
 PROCEDURE	p1
 PROCEDURE	p11
-SELECT event_name, status FROM information_schema.events WHERE event_schema='test';
+SELECT event_name, status FROM information_schema.events WHERE event_schema='test' order
by event_name;
 event_name	status
 e1	SLAVESIDE_DISABLED
 e11	SLAVESIDE_DISABLED
diff -Nrup a/mysql-test/suite/rpl/t/rpl_invoked_features.test
b/mysql-test/suite/rpl/t/rpl_invoked_features.test
--- a/mysql-test/suite/rpl/t/rpl_invoked_features.test	2007-09-07 04:04:48 -04:00
+++ b/mysql-test/suite/rpl/t/rpl_invoked_features.test	2007-12-17 08:51:26 -05:00
@@ -202,10 +202,10 @@ SET GLOBAL EVENT_SCHEDULER = off;
 # Check original objects
 --echo
 SHOW TABLES LIKE 't%';
-SELECT table_name FROM information_schema.views WHERE table_schema='test';
-SELECT trigger_name, event_manipulation, event_object_table FROM
information_schema.triggers WHERE trigger_schema='test';
-SELECT routine_type, routine_name FROM information_schema.routines WHERE
routine_schema='test';
-SELECT event_name, status FROM information_schema.events WHERE event_schema='test';
+SELECT table_name FROM information_schema.views WHERE table_schema='test' order by
table_name;
+SELECT trigger_name, event_manipulation, event_object_table FROM
information_schema.triggers WHERE trigger_schema='test' order by trigger_name;
+SELECT routine_type, routine_name FROM information_schema.routines WHERE
routine_schema='test' order by routine_name;
+SELECT event_name, status FROM information_schema.events WHERE event_schema='test' order
by event_name;
 
 # Check original data
 --echo
@@ -229,10 +229,10 @@ SELECT a,b FROM v11 ORDER BY a;
 # Check replicated objects
 --echo
 SHOW TABLES LIKE 't%';
-SELECT table_name FROM information_schema.views WHERE table_schema='test';
-SELECT trigger_name, event_manipulation, event_object_table FROM
information_schema.triggers WHERE trigger_schema='test';
-SELECT routine_type, routine_name FROM information_schema.routines WHERE
routine_schema='test';
-SELECT event_name, status FROM information_schema.events WHERE event_schema='test';
+SELECT table_name FROM information_schema.views WHERE table_schema='test' order by
table_name;
+SELECT trigger_name, event_manipulation, event_object_table FROM
information_schema.triggers WHERE trigger_schema='test' order by trigger_name;
+SELECT routine_type, routine_name FROM information_schema.routines WHERE
routine_schema='test' order by routine_name;
+SELECT event_name, status FROM information_schema.events WHERE event_schema='test' order
by event_name;
 
 # Check replicated data
 --echo
Thread
• bk commit into 5.1 tree (cmiller:1.2497)Chad MILLER17 Dec