Commit de9d2465 authored by ram@gw.mysql.r18.ru's avatar ram@gw.mysql.r18.ru

Fixes for mysql tests.

parent c5b481d9
...@@ -80,4 +80,4 @@ insert into t1 values ("Alas"); ...@@ -80,4 +80,4 @@ insert into t1 values ("Alas");
use test; use test;
SET TIMESTAMP=1000000000; SET TIMESTAMP=1000000000;
insert into t1 values ("Alas"); insert into t1 values ("Alas");
drop table t1; drop table t1, t2;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1, `"t"1`;
CREATE TABLE t1(a int); CREATE TABLE t1(a int);
INSERT INTO t1 VALUES (1), (2); INSERT INTO t1 VALUES (1), (2);
<?xml version="1.0"?> <?xml version="1.0"?>
...@@ -18,21 +18,22 @@ INSERT INTO t1 VALUES (1), (2); ...@@ -18,21 +18,22 @@ INSERT INTO t1 VALUES (1), (2);
</database> </database>
</mysqldump> </mysqldump>
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE `t"1` (`a"b"c"` char(2)); CREATE TABLE `"t"1` (`a"b"` char(2));
INSERT INTO `t"1` VALUES ("\"1"), ("2\""); INSERT INTO `"t"1` VALUES ("1\""), ("\"2");
<?xml version="1.0"?> <?xml version="1.0"?>
<mysqldump> <mysqldump>
<database name="test"> <database name="test">
<table_structure name="t&quot;1"> <table_structure name="&quot;t&quot;1">
<field Field="a&quot;b&quot;c&quot;" Type="char(2)" Null="YES" /> <field Field="a&quot;b&quot;" Type="char(2)" Null="YES" />
</table_structure> </table_structure>
<table_data name="t&quot;1"> <table_data name="&quot;t&quot;1">
<row> <row>
<field name="a&quot;b&quot;c&quot;">&quot;1</field> <field name="a&quot;b&quot;">1&quot;</field>
</row> </row>
<row> <row>
<field name="a&quot;b&quot;c&quot;">2&quot;</field> <field name="a&quot;b&quot;">&quot;2</field>
</row> </row>
</table_data> </table_data>
</database> </database>
</mysqldump> </mysqldump>
DROP TABLE `"t"1`;
...@@ -55,7 +55,7 @@ a ...@@ -55,7 +55,7 @@ a
10 10
explain select * from t1 where not(a = 10); explain select * from t1 where not(a = 10);
id select_type table type possible_keys key key_len ref rows Extra 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); select * from t1 where not(a = 10);
a a
0 0
......
...@@ -100,4 +100,4 @@ select "--- --position --" as ""; ...@@ -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 --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 # clean up
drop table t1; drop table t1, t2;
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1, `"t"1`;
--enable_warnings --enable_warnings
# XML output # XML output
...@@ -13,7 +13,7 @@ DROP TABLE t1; ...@@ -13,7 +13,7 @@ DROP TABLE t1;
# Bug #1707 # Bug #1707
# #
CREATE TABLE `t"1` (`a"b"c"` char(2)); CREATE TABLE `"t"1` (`a"b"` char(2));
INSERT INTO `t"1` VALUES ("\"1"), ("2\""); INSERT INTO `"t"1` VALUES ("1\""), ("\"2");
--exec $MYSQL_DUMP --skip-all -X test --exec $MYSQL_DUMP --skip-all -X test \"t\"1
DROP TABLE `t"1`; DROP TABLE `"t"1`;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment