[Commits] Rev 3242: Fix a few failing tests on win2008r2-vs2010-amd64-debug in file:///H:/bzr/5.5/

Vladislav Vaintroub wlad at montyprogram.com
Thu Jan 26 17:56:33 EET 2012


At file:///H:/bzr/5.5/

------------------------------------------------------------
revno: 3242
revision-id: wlad at montyprogram.com-20120126155540-5mqt6bqtw3m21l7k
parent: wlad at montyprogram.com-20120126150608-7acqqi976ebtlurs
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.5
timestamp: Thu 2012-01-26 16:55:40 +0100
message:
  Fix a few failing tests  on win2008r2-vs2010-amd64-debug
-------------- next part --------------
=== modified file 'mysql-test/include/wait_until_connected_again.inc'
--- a/mysql-test/include/wait_until_connected_again.inc	2009-02-19 09:01:25 +0000
+++ b/mysql-test/include/wait_until_connected_again.inc	2012-01-26 15:55:40 +0000
@@ -14,7 +14,7 @@
   # Strangely enough, the server might return "Too many connections"
   # while being shutdown, thus 1040 is an "allowed" error
   # See BUG#36228
-  --error 0,1040,1053,2002,2003,2006,2013
+  --error 0,1040,1053,2002,2003,2005,2006,2013
   show status;
 
   dec $counter;

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2011-10-19 19:45:18 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2012-01-26 15:55:40 +0000
@@ -205,7 +205,7 @@
 def	mysql	user	max_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11) unsigned				
 def	mysql	user	max_questions	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11) unsigned				
 def	mysql	user	max_updates	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11) unsigned				
-def	mysql	user	max_user_connections	40	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11) unsigned				
+def	mysql	user	max_user_connections	40	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)				
 def	mysql	user	Password	3		NO	char	41	41	NULL	NULL	NULL	latin1	latin1_bin	char(41)				
 def	mysql	user	plugin	41		NO	char	64	64	NULL	NULL	NULL	latin1	latin1_swedish_ci	char(64)				
 def	mysql	user	Process_priv	12	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
@@ -515,6 +515,6 @@
 NULL	mysql	user	max_questions	int	NULL	NULL	NULL	NULL	int(11) unsigned
 NULL	mysql	user	max_updates	int	NULL	NULL	NULL	NULL	int(11) unsigned
 NULL	mysql	user	max_connections	int	NULL	NULL	NULL	NULL	int(11) unsigned
-NULL	mysql	user	max_user_connections	int	NULL	NULL	NULL	NULL	int(11) unsigned
+NULL	mysql	user	max_user_connections	int	NULL	NULL	NULL	NULL	int(11)
 1.0000	mysql	user	plugin	char	64	64	latin1	latin1_swedish_ci	char(64)
 1.0000	mysql	user	authentication_string	text	65535	65535	utf8	utf8_bin	text

=== modified file 'mysql-test/suite/funcs_1/r/processlist_priv_ps.result'
--- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result	2011-10-19 19:45:18 +0000
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result	2012-01-26 15:55:40 +0000
@@ -85,7 +85,7 @@
 DROP DATABASE information_schema;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 RENAME DATABASE information_schema TO info_schema;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1
 ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 ####################################################################################
@@ -154,7 +154,7 @@
 DROP DATABASE information_schema;
 ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
 RENAME DATABASE information_schema TO info_schema;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1
 ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME;
 ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema'
 ####################################################################################

=== modified file 'mysql-test/suite/sys_vars/t/completion_type_func.test'
--- a/mysql-test/suite/sys_vars/t/completion_type_func.test	2010-11-09 11:25:56 +0000
+++ b/mysql-test/suite/sys_vars/t/completion_type_func.test	2012-01-26 15:55:40 +0000
@@ -156,7 +156,7 @@
 
 --echo ## Inserting rows should give error here because connection should ##
 --echo ## disconnect after using COMMIT ##
---Error 2006,2013,ER_QUERY_INTERRUPTED
+--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED
 INSERT INTO t1 VALUES(4,'Record_4');
 
 --echo switch to connection test_con2
@@ -171,7 +171,7 @@
 ROLLBACK;
 
 --echo ## Expect a failure due to COMMIT/ROLLBACK AND RELEASE behavior ##
---Error 2006,2013,ER_QUERY_INTERRUPTED
+--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED
 INSERT INTO t1 VALUES(4,'Record_4');
 
 connection default;



More information about the commits mailing list