diff options
author | unknown <msvensson@neptunus.(none)> | 2005-06-22 20:43:10 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-06-22 20:43:10 +0200 |
commit | 3f974aecab0ce8128aec859e94b75e89c07f202c (patch) | |
tree | f5a4a9b5a645068d209ba7df639b8ad528613771 /mysql-test/r/mysqldump.result | |
parent | f36336daaec7440dadbb83b4f0d0c23c878f0b4f (diff) | |
parent | 406673b0b320d66562e2778323c59034c22be225 (diff) | |
download | mariadb-git-3f974aecab0ce8128aec859e94b75e89c07f202c.tar.gz |
Merging
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqldump.result')
-rw-r--r-- | mysql-test/r/mysqldump.result | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 097976ad383..9075bec003b 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -1580,6 +1580,7 @@ mysqldump: Got error: 1049: Unknown database 'mysqldump_test_d' when selecting t mysqldump: Got error: 1102: Incorrect database name 'mysqld\ump_test_db' when selecting the database drop table t1, t2, t3; drop database mysqldump_test_db; +use test; create table t1 (a int(10)); create table t2 (pk int primary key auto_increment, a int(10), b varchar(30), c datetime, d blob, e text); @@ -1597,7 +1598,7 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir </row> <row> <field name="a">20</field> - </row> + </row> </table_data> <table_data name="t2"> <row> |