summaryrefslogtreecommitdiff
path: root/mysql-test/r/key_diff.result
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-12-29 16:06:10 +0200
committerunknown <monty@donna.mysql.com>2000-12-29 16:06:10 +0200
commit29fa72526a22c31a79c73a00bf7b1974c44ff9d2 (patch)
tree53ef6da34dcfaf79e0e133177cccfb9bb63a9637 /mysql-test/r/key_diff.result
parentccf4b2829882f566d5665e4ddf7eabcd6d197872 (diff)
downloadmariadb-git-29fa72526a22c31a79c73a00bf7b1974c44ff9d2.tar.gz
Fixed --no-defaults in mysqltest
BUILD/compile-pentium-debug: Use /usr/local/BerkeleyDB-dbug/ if available BUILD/compile-pentium: Use /usr/local/BerkeleyDB-opt/ if available Docs/internals.texi: Added 'unedited' documentation for mysys functions Docs/manual.texi: Cleanups client/mysql.cc: Added client language to status client/mysqltest.c: Fixed bug with --no-defaults heap/_check.c: Added option to print status. heap/hp_close.c: Update to use new status interface heap/hp_hash.c: Clean up hash function and add new experimental hash heap/hp_test1.c: Update to use new status interface heap/hp_test2.c: Update to use new status interface include/heap.h: Update to use new status interface mysql-test/r/key_diff.result: Cleanup tests that may give rows in random order mysql-test/r/type_blob.result: Removed \r from output as this confused bk mysql-test/t/key_diff.test: Cleanup tests that may give rows in random order BitKeeper/etc/ignore: Added Docs/my_sys.doc to the ignore list mysql-test/t/type_blob.test: Removed \r from output as this confused bk mysys/hash.c: Add new experimental hash function scripts/safe_mysqld.sh: Added --mysqld option sql/ha_innobase.cc: Fixed store_locking sql/mysqld.cc: Cleaned up warning messages
Diffstat (limited to 'mysql-test/r/key_diff.result')
-rw-r--r--mysql-test/r/key_diff.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/key_diff.result b/mysql-test/r/key_diff.result
index 5668bb01eba..ab5b9bcc0e7 100644
--- a/mysql-test/r/key_diff.result
+++ b/mysql-test/r/key_diff.result
@@ -28,12 +28,12 @@ table type possible_keys key key_len ref rows Extra
t1 ALL a NULL NULL NULL 5
t2 ALL b NULL NULL NULL 5 where used
a b a b
-A B b A
-a a b A
A B a a
+A B b A
+C c C c
a a a a
+a a b A
b A A B
-C c C c
a b
A B
a a