diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-11-03 20:43:21 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-11-03 20:43:21 +0200 |
| commit | 78ee8de22df90d4c0d21887c67e0d0e51b210727 (patch) | |
| tree | 00290e133e6a9a0d5f59b30ed1e75de72ccf5d28 /mysql-test | |
| parent | ef84364e5f287684e461b46daef44578ef5f7671 (diff) | |
| parent | 8b648b03366a0037b178d5c17a728eda9cccb0e3 (diff) | |
| download | mariadb-git-78ee8de22df90d4c0d21887c67e0d0e51b210727.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysqldump.result | 29 | ||||
| -rw-r--r-- | mysql-test/t/mysqldump.test | 5 |
2 files changed, 32 insertions, 2 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index fa9658c0202..27c2f8d6304 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -5,7 +5,7 @@ INSERT INTO t1 VALUES (1), (2); <mysqldump> <database name="test"> <table_structure name="t1"> - <field Field="a" Type="int(11)" Null="YES" /> + <field Field="a" Type="int(11)" Null="YES" Key="" Extra="" /> </table_structure> <table_data name="t1"> <row> @@ -18,13 +18,38 @@ INSERT INTO t1 VALUES (1), (2); </database> </mysqldump> DROP TABLE t1; +CREATE TABLE t1(a int, b text, c varchar(3)); +INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES"); +<?xml version="1.0"?> +<mysqldump> +<database name="test"> + <table_structure name="t1"> + <field Field="a" Type="int(11)" Null="YES" Key="" Extra="" /> + <field Field="b" Type="text" Null="YES" Key="" Extra="" /> + <field Field="c" Type="char(3)" Null="YES" Key="" Extra="" /> + </table_structure> + <table_data name="t1"> + <row> + <field name="a">1</field> + <field name="b">test</field> + <field name="c">tes</field> + </row> + <row> + <field name="a">2</field> + <field name="b">TEST</field> + <field name="c">TES</field> + </row> + </table_data> +</database> +</mysqldump> +DROP TABLE t1; 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"" Type="char(2)" Null="YES" /> + <field Field="a"b"" Type="char(2)" Null="YES" Key="" Extra="" /> </table_structure> <table_data name=""t"1"> <row> diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 01db0420943..90f2a227756 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -9,6 +9,11 @@ INSERT INTO t1 VALUES (1), (2); --exec $MYSQL_DUMP --skip-all -X test t1 DROP TABLE t1; +CREATE TABLE t1(a int, b text, c varchar(3)); +INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES"); +--exec $MYSQL_DUMP --skip-all -X test t1 +DROP TABLE t1; + # # Bug #1707 # |