diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2003-10-31 16:37:36 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2003-10-31 16:37:36 +0400 |
| commit | 04bad39e33757c1bd009bacd8fd065436806504a (patch) | |
| tree | 4ded829a6ccd71fada100d9e736ed4104b8d9000 | |
| parent | bd4261d9afdde856185c991889890e3486b65946 (diff) | |
| download | mariadb-git-04bad39e33757c1bd009bacd8fd065436806504a.tar.gz | |
Fixes for mysql tests.
mysql-test/r/mysqlbinlog.result:
fixes for mysql tests.
mysql-test/r/mysqldump.result:
fixes for mysql tests.
mysql-test/r/negation_elimination.result:
fixes for mysql tests.
mysql-test/t/mysqlbinlog.test:
fixes for mysql tests.
mysql-test/t/mysqldump.test:
fixes for mysql tests.
| -rw-r--r-- | mysql-test/r/mysqlbinlog.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/mysqldump.result | 17 | ||||
| -rw-r--r-- | mysql-test/r/negation_elimination.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysqlbinlog.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysqldump.test | 10 |
5 files changed, 17 insertions, 16 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index eeac31ba40b..92453b3e35b 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -80,4 +80,4 @@ insert into t1 values ("Alas"); use test; SET TIMESTAMP=1000000000; insert into t1 values ("Alas"); -drop table t1; +drop table t1, t2; diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 4f44ec343d6..fa9658c0202 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -1,4 +1,4 @@ -DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t1, `"t"1`; CREATE TABLE t1(a int); INSERT INTO t1 VALUES (1), (2); <?xml version="1.0"?> @@ -18,21 +18,22 @@ INSERT INTO t1 VALUES (1), (2); </database> </mysqldump> DROP TABLE t1; -CREATE TABLE `t"1` (`a"b"c"` char(2)); -INSERT INTO `t"1` VALUES ("\"1"), ("2\""); +CREATE TABLE `"t"1` (`a"b"` char(2)); +INSERT INTO `"t"1` VALUES ("1\""), ("\"2"); <?xml version="1.0"?> <mysqldump> <database name="test"> - <table_structure name="t"1"> - <field Field="a"b"c"" Type="char(2)" Null="YES" /> + <table_structure name=""t"1"> + <field Field="a"b"" Type="char(2)" Null="YES" /> </table_structure> - <table_data name="t"1"> + <table_data name=""t"1"> <row> - <field name="a"b"c"">"1</field> + <field name="a"b"">1"</field> </row> <row> - <field name="a"b"c"">2"</field> + <field name="a"b"">"2</field> </row> </table_data> </database> </mysqldump> +DROP TABLE `"t"1`; diff --git a/mysql-test/r/negation_elimination.result b/mysql-test/r/negation_elimination.result index 9a9764c8f18..8ca8ae2f12e 100644 --- a/mysql-test/r/negation_elimination.result +++ b/mysql-test/r/negation_elimination.result @@ -55,7 +55,7 @@ a 10 explain select * from t1 where not(a = 10); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index NULL a 5 NULL 21 Using where; Using index +1 SIMPLE t1 range a a 5 NULL 19 Using where; Using index select * from t1 where not(a = 10); a 0 diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index c71ffb21354..2d1277a1cbc 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -100,4 +100,4 @@ select "--- --position --" as ""; --exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --position=27 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 # clean up -drop table t1; +drop table t1, t2; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 7a375b05fec..01db0420943 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1,5 +1,5 @@ --disable_warnings -DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t1, `"t"1`; --enable_warnings # XML output @@ -13,7 +13,7 @@ DROP TABLE t1; # Bug #1707 # -CREATE TABLE `t"1` (`a"b"c"` char(2)); -INSERT INTO `t"1` VALUES ("\"1"), ("2\""); ---exec $MYSQL_DUMP --skip-all -X test -DROP TABLE `t"1`; +CREATE TABLE `"t"1` (`a"b"` char(2)); +INSERT INTO `"t"1` VALUES ("1\""), ("\"2"); +--exec $MYSQL_DUMP --skip-all -X test \"t\"1 +DROP TABLE `"t"1`; |