summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-08-10 19:02:23 +0300
committerunknown <monty@hundin.mysql.fi>2001-08-10 19:02:23 +0300
commit1ddd584a23bac9ab78933113f16eb8bf4dc589e0 (patch)
tree7822d0284c221f7796bdf702de8aab558e7bb0ec /mysql-test
parent73e86d62dedbf29fe76cc05270e6245432206201 (diff)
downloadmariadb-git-1ddd584a23bac9ab78933113f16eb8bf4dc589e0.tar.gz
Allow myisam-recover="" and --sql-mode=""
Docs/manual.texi: Changelog mysql-test/r/distinct.result: new test case mysql-test/r/innodb.result: Fixed result
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/distinct.result6
-rw-r--r--mysql-test/r/innodb.result2
2 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result
index 309ed5dff4e..8f8770e5602 100644
--- a/mysql-test/r/distinct.result
+++ b/mysql-test/r/distinct.result
@@ -167,3 +167,9 @@ a sec_to_time(sum(time_to_sec(t)))
a sec_to_time(sum(time_to_sec(t)))
1 00:06:15
1 00:36:30
+a
+4
+3
+a c
+4 NULL
+3 NULL
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 52251e8f87a..fd7900af13b 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -438,7 +438,7 @@ hello 1
Table Op Msg_type Msg_text
test.t1 optimize error The handler for the table doesn't support check/repair
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment
-t1 0 PRIMARY 1 a A 1 NULL NULL
+t1 0 PRIMARY 1 a A 2 NULL NULL
i j
1 2
i j