summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-09-18 04:58:15 +0300
committerunknown <monty@hundin.mysql.fi>2001-09-18 04:58:15 +0300
commitc91a3df5c38ee5f4ebc7e42f0c17da79d4930801 (patch)
tree4ac99859c8cc85b07cbaadfa18dc36026c886644 /mysql-test/r
parent9d62e4a05b1c8399787b624a90e0cab0aa42c57c (diff)
downloadmariadb-git-c91a3df5c38ee5f4ebc7e42f0c17da79d4930801.tar.gz
Fix for LOAD DATA FROM MASTER when using tables with checksum
Fixed some wrong test cases Docs/manual.texi: Changelog extra/perror.c: Added BDB table errors include/myisam.h: Fix for LOAD DATA FROM MASTER when using tables with checksum myisam/mi_check.c: Fix for LOAD DATA FROM MASTER when using tables with checksum mysql-test/mysql-test-run.sh: Better logging mysql-test/r/join.result: Fixed missing results mysql-test/r/rpl000006.result: Updated result mysql-test/t/join.test: Fixed wrong test mysql-test/t/rpl000001.test: Fixed wrong test mysql-test/t/rpl000006.test: Cleanup mysql-test/t/rpl000017-slave.sh: Fixed too long password mysql-test/t/rpl000017.test: Fixed too long password sql/ha_myisam.cc: Fix for LOAD DATA FROM MASTER when using tables with checksum sql/handler.cc: Unique error for DEADLOCK sql/slave.cc: Fix for LOAD DATA FROM MASTER when using tables with checksum
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/join.result13
-rw-r--r--mysql-test/r/rpl000006.result2
2 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index 00285c57a7e..3c5a72edc68 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -7,3 +7,16 @@ id count(t2.id)
id count(t2.id)
75 1
107 1
+id catid stateid countyid
+27 2 12 11
+28 2 12 11
+29 2 12 25
+26 1 6 37
+id catid stateid countyid
+26 1 6 37
+27 2 12 11
+28 2 12 11
+29 2 12 25
+a
+1
+2
diff --git a/mysql-test/r/rpl000006.result b/mysql-test/r/rpl000006.result
index 31a36f88f39..56cd7166510 100644
--- a/mysql-test/r/rpl000006.result
+++ b/mysql-test/r/rpl000006.result
@@ -2,3 +2,5 @@ unix_timestamp(t)
200006
unix_timestamp(t)
200006
+Table Op Msg_type Msg_text
+test.t1 check status OK