summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <ram@gw.mysql.r18.ru>2003-12-11 17:37:45 +0400
committerunknown <ram@gw.mysql.r18.ru>2003-12-11 17:37:45 +0400
commitba249c10c41f4dde9f9fe9dafa50a7cb30bc33fa (patch)
treef20c6ba1388863709b5c5c579e6bb07e7b2b621c /mysql-test
parente691523422136c11f9a029e0add3445e9553423c (diff)
downloadmariadb-git-ba249c10c41f4dde9f9fe9dafa50a7cb30bc33fa.tar.gz
Added --comments mysqldump option (default value is 1).
Fixed mysqldump test. client/mysqldump.c: Added --comments option (default value is 1). mysql-test/r/mysqldump.result: fixed using --skip-comment option mysql-test/t/mysqldump.test: fixed using --skip-comment option
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/mysqldump.result20
-rw-r--r--mysql-test/t/mysqldump.test22
2 files changed, 30 insertions, 12 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 085cf2788f9..27ca3fbaaf5 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -15,3 +15,23 @@ INSERT INTO t1 VALUES (1), (2);
</database>
</mysqldump>
DROP TABLE t1;
+CREATE TABLE t1 (a decimal(240, 20));
+INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
+("0987654321098765432109876543210987654321");
+CREATE TABLE t1 (
+ a decimal(240,20) default NULL
+) TYPE=MyISAM;
+
+INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890.00000000000000000000");
+INSERT INTO t1 VALUES ("0987654321098765432109876543210987654321.00000000000000000000");
+
+DROP TABLE t1;
+CREATE TABLE t1 (a double);
+INSERT INTO t1 VALUES (-9e999999);
+CREATE TABLE t1 (
+ a double default NULL
+) TYPE=MyISAM;
+
+INSERT INTO t1 VALUES (NULL);
+
+DROP TABLE t1;
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index aea5859fcfa..525949bd602 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -6,26 +6,24 @@ DROP TABLE IF EXISTS t1;
CREATE TABLE t1(a int);
INSERT INTO t1 VALUES (1), (2);
---exec $MYSQL_DUMP -X test t1
+--exec $MYSQL_DUMP --skip-comments -X test t1
DROP TABLE t1;
#
# Bug #2005
-# TODO: solve the problem with 'replace' and enable test
#
-#CREATE TABLE t1 (a decimal(240, 20));
-#INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
-#("0987654321098765432109876543210987654321");
-#--exec $MYSQL_DUMP test t1
-#DROP TABLE t1;
+CREATE TABLE t1 (a decimal(240, 20));
+INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
+("0987654321098765432109876543210987654321");
+--exec $MYSQL_DUMP --skip-comments test t1
+DROP TABLE t1;
#
# Bug #2055
-# TODO: solve the problem with 'replace' and enable test
#
-#CREATE TABLE t1 (a double);
-#INSERT INTO t1 VALUES (-9e999999);
-#--exec $MYSQL_DUMP -X test t1
-#DROP TABLE t1;
+CREATE TABLE t1 (a double);
+INSERT INTO t1 VALUES (-9e999999);
+--exec $MYSQL_DUMP --skip-comments test t1
+DROP TABLE t1;