diff options
author | unknown <brian@zim.(none)> | 2005-05-08 16:19:06 -0700 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2005-05-08 16:19:06 -0700 |
commit | 291a628ec5a66e2339c9bceae585ab769dfe8f00 (patch) | |
tree | ed525a6041ce93087659d2dba13b76945979f967 /mysql-test/t/mysqldump.test | |
parent | 848611b5ed1e565d02eea896e22753b818c458c5 (diff) | |
parent | d808b76db5b5fedda598e7e9368439472e5aef15 (diff) | |
download | mariadb-git-291a628ec5a66e2339c9bceae585ab769dfe8f00.tar.gz |
Merge
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
client/client_priv.h:
c
e
?
h
mysql-test/t/mysqldump.test:
Resolved conflict.
Diffstat (limited to 'mysql-test/t/mysqldump.test')
-rw-r--r-- | mysql-test/t/mysqldump.test | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 949c62ef288..5d2ca044701 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -204,3 +204,14 @@ CREATE TABLE t1 (a char(10)); INSERT INTO t1 VALUES ('\''); --exec $MYSQL_DUMP --skip-comments test t1 DROP TABLE t1; + +# +# Test for --insert-ignore +# + +CREATE TABLE t1 (a decimal(240, 20)); +INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"), +("0987654321098765432109876543210987654321"); +--exec $MYSQL_DUMP --insert-ignore test t1 +--exec $MYSQL_DUMP --insert-ignore --delayed-insert test t1 +DROP TABLE t1; |