List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:May 20 2010 1:57pm
Subject:bzr push into mysql-pe branch (joro:4070 to 4071) Bug#53857
View as plain text  
 4071 Georgi Kodinov	2010-05-20
      Disable the tests that fail because of bug #53857

    modified:
      mysql-test/r/mysqlcheck.result
      mysql-test/t/mysqlcheck.test
 4070 Sergey Glukhov	2010-05-20 [merge]
      5.1-bugteam->mysql-pe merge
     @ dbug/dbug.c
        5.1-bugteam->mysql-pe merge
     @ mysql-test/r/variables_debug.result
        5.1-bugteam->mysql-pe merge
     @ mysql-test/t/variables_debug.test
        5.1-bugteam->mysql-pe merge

    modified:
      dbug/dbug.c
      mysql-test/r/variables_debug.result
      mysql-test/t/variables_debug.test
=== modified file 'mysql-test/r/mysqlcheck.result'
--- a/mysql-test/r/mysqlcheck.result	2010-01-22 08:06:07 +0000
+++ b/mysql-test/r/mysqlcheck.result	2010-05-20 13:57:00 +0000
@@ -140,57 +140,6 @@ v1
 v-1
 drop view v1, `v-1`;
 drop table t1;
-SET NAMES utf8;
-CREATE TABLE `#mysql50#@` (a INT);
-SHOW TABLES;
-Tables_in_test
-#mysql50#@
-SET NAMES DEFAULT;
-mysqlcheck --fix-table-names --databases test
-SET NAMES utf8;
-SHOW TABLES;
-Tables_in_test
-@
-DROP TABLE `@`;
-CREATE TABLE `я` (a INT);
-SET NAMES DEFAULT;
-mysqlcheck --default-character-set="latin1" --databases test
-test.?
-Error    : Table doesn't exist
-status   : Operation failed
-mysqlcheck --default-character-set="utf8" --databases test
-test.я                                            OK
-SET NAMES utf8;
-DROP TABLE `я`;
-SET NAMES DEFAULT;
-CREATE DATABASE `#mysql50#a@b`;
-USE `#mysql50#a@b`;
-CREATE TABLE `#mysql50#c@d` (a INT);
-CREATE TABLE t1 (a INT);
-SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
-WHERE TRIGGER_SCHEMA="#mysql50#a@b" ORDER BY trigger_name;
-TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
-def	#mysql50#a@b	tr1	INSERT	def	#mysql50#a@b	#mysql50#c@d	0	NULL	SET NEW.a = 10 * NEW.a	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
-def	#mysql50#a@b	tr2	INSERT	def	#mysql50#a@b	t1	0	NULL	SET NEW.a = 100 * NEW.a	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
-mysqlcheck --fix-db-names --fix-table-names --all-databases
-USE `a@b`;
-SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
-WHERE TRIGGER_SCHEMA="a@b" ORDER BY trigger_name;
-TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
-def	a@b	tr1	INSERT	def	a@b	c@d	0	NULL	SET NEW.a = 10 * NEW.a	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		root@localhost	utf8	utf8_general_ci	latin1_swedish_ci
-def	a@b	tr2	INSERT	def	a@b	t1	0	NULL	SET NEW.a = 100 * NEW.a	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		root@localhost	utf8	utf8_general_ci	latin1_swedish_ci
-INSERT INTO `c@d` VALUES (2), (1);
-SELECT * FROM `c@d`;
-a
-20
-10
-INSERT INTO t1 VALUES (3), (5);
-SELECT * FROM t1;
-a
-300
-500
-DROP DATABASE `a@b`;
-USE test;
 #
 # Bug #31821: --all-in-1 and --fix-table-names don't work together
 #

=== modified file 'mysql-test/t/mysqlcheck.test'
--- a/mysql-test/t/mysqlcheck.test	2009-10-25 13:39:16 +0000
+++ b/mysql-test/t/mysqlcheck.test	2010-05-20 13:57:00 +0000
@@ -123,74 +123,76 @@ drop table t1;
 # Bug #41385: Crash when attempting to repair a #mysql50# upgraded table with
 #             triggers
 #
-SET NAMES utf8;
-CREATE TABLE `#mysql50#@` (a INT);
-SHOW TABLES;
-SET NAMES DEFAULT;
---echo mysqlcheck --fix-table-names --databases test
---exec $MYSQL_CHECK --fix-table-names --databases test
-SET NAMES utf8;
-SHOW TABLES;
-DROP TABLE `@`;
-
-CREATE TABLE `я` (a INT);
-SET NAMES DEFAULT;
---echo mysqlcheck --default-character-set="latin1" --databases test
-# Error returned depends on platform, replace it with "Table doesn't exist"
---replace_result "Can't find file: './test/@003f.frm' (errno: 22)" "Table doesn't exist" "Table 'test.?' doesn't exist" "Table doesn't exist"
---exec $MYSQL_CHECK --default-character-set="latin1" --databases test
---echo mysqlcheck --default-character-set="utf8" --databases test
---exec $MYSQL_CHECK --default-character-set="utf8" --databases test
-SET NAMES utf8;
-DROP TABLE `я`;
-SET NAMES DEFAULT;
-
-CREATE DATABASE `#mysql50#a@b`;
-USE `#mysql50#a@b`;
-CREATE TABLE `#mysql50#c@d` (a INT);
-CREATE TABLE t1 (a INT);
+##TODO: ENABLE when Bug #53857 is resolved
+#SET NAMES utf8;
+#CREATE TABLE `#mysql50#@` (a INT);
+#SHOW TABLES;
+#SET NAMES DEFAULT;
+#--echo mysqlcheck --fix-table-names --databases test
+#--exec $MYSQL_CHECK --fix-table-names --databases test
+#SET NAMES utf8;
+#SHOW TABLES;
+#DROP TABLE `@`;
+
+#CREATE TABLE `я` (a INT);
+#SET NAMES DEFAULT;
+#--echo mysqlcheck --default-character-set="latin1" --databases test
+## Error returned depends on platform, replace it with "Table doesn't exist"
+#--replace_result "Can't find file: './test/@003f.frm' (errno: 22)" "Table doesn't exist" "Table 'test.?' doesn't exist" "Table doesn't exist"
+#--exec $MYSQL_CHECK --default-character-set="latin1" --databases test
+#--echo mysqlcheck --default-character-set="utf8" --databases test
+#--exec $MYSQL_CHECK --default-character-set="utf8" --databases test
+#SET NAMES utf8;
+#DROP TABLE `я`;
+#SET NAMES DEFAULT;
+
+#CREATE DATABASE `#mysql50#a@b`;
+#USE `#mysql50#a@b`;
+#CREATE TABLE `#mysql50#c@d` (a INT);
+#CREATE TABLE t1 (a INT);
 
 # Create 5.0 like triggers
-let $MYSQLD_DATADIR= `select @@datadir`;
---write_file $MYSQLD_DATADIR/a@b/c@stripped
-TYPE=TRIGGERS
-triggers='CREATE DEFINER=`root`@`localhost` TRIGGER tr1 BEFORE INSERT ON `c@d` FOR EACH ROW SET NEW.a = 10 * NEW.a'
-sql_modes=0
-definers='root@localhost'
-EOF
---write_file $MYSQLD_DATADIR/a@b/tr1.TRN
-TYPE=TRIGGERNAME
-trigger_table=c@d
-EOF
---write_file $MYSQLD_DATADIR/a@b/t1.TRG
-TYPE=TRIGGERS
-triggers='CREATE DEFINER=`root`@`localhost` TRIGGER tr2 BEFORE INSERT ON `a@b`.t1 FOR EACH ROW SET NEW.a = 100 * NEW.a'
-sql_modes=0
-definers='root@localhost'
-EOF
---write_file $MYSQLD_DATADIR/a@b/tr2.TRN
-TYPE=TRIGGERNAME
-trigger_table=t1
-EOF
-
-SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
-  WHERE TRIGGER_SCHEMA="#mysql50#a@b" ORDER BY trigger_name;
-
---echo mysqlcheck --fix-db-names --fix-table-names --all-databases
---exec $MYSQL_CHECK --default-character-set=utf8 --fix-db-names --fix-table-names --all-databases
-
-USE `a@b`;
-SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
-  WHERE TRIGGER_SCHEMA="a@b" ORDER BY trigger_name;
-
-INSERT INTO `c@d` VALUES (2), (1);
-SELECT * FROM `c@d`;
-INSERT INTO t1 VALUES (3), (5);
-SELECT * FROM t1;
-
-DROP DATABASE `a@b`;
-
-USE test;
+#let $MYSQLD_DATADIR= `select @@datadir`;
+#--write_file $MYSQLD_DATADIR/a@b/c@stripped
+#TYPE=TRIGGERS
+#triggers='CREATE DEFINER=`root`@`localhost` TRIGGER tr1 BEFORE INSERT ON `c@d` FOR EACH ROW SET NEW.a = 10 * NEW.a'
+#sql_modes=0
+#definers='root@localhost'
+#EOF
+#--write_file $MYSQLD_DATADIR/a@b/tr1.TRN
+#TYPE=TRIGGERNAME
+#trigger_table=c@d
+#EOF
+#--write_file $MYSQLD_DATADIR/a@b/t1.TRG
+#TYPE=TRIGGERS
+#triggers='CREATE DEFINER=`root`@`localhost` TRIGGER tr2 BEFORE INSERT ON `a@b`.t1 FOR EACH ROW SET NEW.a = 100 * NEW.a'
+#sql_modes=0
+#definers='root@localhost'
+#EOF
+#--write_file $MYSQLD_DATADIR/a@b/tr2.TRN
+#TYPE=TRIGGERNAME
+#trigger_table=t1
+#EOF
+#
+#SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
+#  WHERE TRIGGER_SCHEMA="#mysql50#a@b" ORDER BY trigger_name;
+#
+#--echo mysqlcheck --fix-db-names --fix-table-names --all-databases
+#--exec $MYSQL_CHECK --default-character-set=utf8 --fix-db-names --fix-table-names --all-databases
+#
+#USE `a@b`;
+#SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
+#  WHERE TRIGGER_SCHEMA="a@b" ORDER BY trigger_name;
+#
+#INSERT INTO `c@d` VALUES (2), (1);
+#SELECT * FROM `c@d`;
+#INSERT INTO t1 VALUES (3), (5);
+#SELECT * FROM t1;
+#
+#DROP DATABASE `a@b`;
+#
+#USE test;
+##TODO: ENABLE when Bug #53857 is resolved
 
 --echo #
 --echo # Bug #31821: --all-in-1 and --fix-table-names don't work together

Attachment: [text/bzr-bundle] bzr/joro@sun.com-20100520135700-yfiuvwi1ihu309zw.bundle
Thread
bzr push into mysql-pe branch (joro:4070 to 4071) Bug#53857Georgi Kodinov20 May