From e56db85890820c4e12db2509f3644ac9b4c162bc Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 27 Dec 2000 03:31:06 +0200 Subject: Extended mysqltest with --commands and 'require' Fixed test results. Added mysqld variable 'have_isam' BitKeeper/deleted/.del-master-slave.inc~556fd038c3a3d54: Delete: mysql-test/t/include/master-slave.inc BitKeeper/deleted/.del-README~f9fd36f3c3711305: Delete: mysql-test/r/3.23/README Docs/manual.texi: Fixed typos client/mysqltest.c: Changed internal commands to accept -- before them. Added command 'require' to make it possible to skip tests if the mysqld server lacks some capabilites. Removed extra \t at end of lines configure.in: Update myisam/myisamlog.c: cleanup mysql-test/mysql-test-run.sh: Added support for 'not supported' tests mysql-test/r/alt000001.result: Removed end tab mysql-test/r/bdb.result: Removed end tab mysql-test/r/crypt.result: Removed end tab mysql-test/r/equal.result: Removed end tab mysql-test/r/ft0000001.a.result: Removed end tab mysql-test/r/ft0000001.b.result: Removed end tab mysql-test/r/ft0000001.c.result: Removed end tab mysql-test/r/ft0000001.d.result: Removed end tab mysql-test/r/ft0000001.e.result: Removed end tab mysql-test/r/ft0000002.a.result: Removed end tab mysql-test/r/ft0000002.b.result: Removed end tab mysql-test/r/ft0000002.c.result: Removed end tab mysql-test/r/ins000001.result: Removed end tab mysql-test/r/mrg000001.dummy.result: Removed end tab mysql-test/r/mrg000001.result: Removed end tab mysql-test/r/mrg000002.result: Removed end tab mysql-test/r/rpl000001.a.result: Removed end tab mysql-test/r/rpl000001.b.result: Removed end tab mysql-test/r/rpl000002.result: Removed end tab mysql-test/r/rpl000003.result: Removed end tab mysql-test/r/rpl000004.a.result: Removed end tab mysql-test/r/rpl000004.b.result: Removed end tab mysql-test/r/rpl000005.result: Removed end tab mysql-test/r/rpl000006.result: Removed end tab mysql-test/r/rpl000007.result: Removed end tab mysql-test/r/rpl000008.result: Removed end tab mysql-test/r/rpl000009.result: Removed end tab mysql-test/r/rpl000010.result: Removed end tab mysql-test/r/rpl000011.result: Removed end tab mysql-test/r/rpl000012.result: Removed end tab mysql-test/r/rpl000012.status.result: Removed end tab mysql-test/r/rpl000013.result: Removed end tab mysql-test/r/rpl000013.status.result: Removed end tab mysql-test/r/rpl000014.result: Removed end tab mysql-test/r/rpl000015.result: Removed end tab mysql-test/r/rpl000016.result: Removed end tab mysql-test/r/sel000001.result: Removed end tab mysql-test/r/sel000002.result: Removed end tab mysql-test/r/sel000003.result: Removed end tab mysql-test/r/sel000004.result: Removed end tab mysql-test/r/sel000005.result: Removed end tab mysql-test/r/sel000006.result: Removed end tab mysql-test/r/sel000007.result: Removed end tab mysql-test/r/sel000008.result: Removed end tab mysql-test/r/sel000009.result: Removed end tab mysql-test/r/sel000010.result: Removed end tab mysql-test/r/sel000011.result: Removed end tab mysql-test/r/sel000012.result: Removed end tab mysql-test/r/sel000013.result: Removed end tab mysql-test/r/sel000014.result: Removed end tab mysql-test/r/sel000015.result: Removed end tab mysql-test/r/sel000016.result: Removed end tab mysql-test/r/sel000017.result: Removed end tab mysql-test/r/sel000018.result: Removed end tab mysql-test/r/sel000019.result: Removed end tab mysql-test/r/sel000020.result: Removed end tab mysql-test/r/sel000021.result: Removed end tab mysql-test/r/sel000022.result: Removed end tab mysql-test/r/sel000023.result: Removed end tab mysql-test/r/sel000024.result: Removed end tab mysql-test/r/sel000025.result: Removed end tab mysql-test/r/sel000026.result: Removed end tab mysql-test/r/sel000027.result: Removed end tab mysql-test/r/sel000028.result: Removed end tab mysql-test/r/sel000029.result: Removed end tab mysql-test/r/sel000030.result: Removed end tab mysql-test/r/sel000031.result: Removed end tab mysql-test/r/sel000032.result: Removed end tab mysql-test/r/sel000033.result: Removed end tab mysql-test/r/sel000100.result: Removed end tab mysql-test/r/shw000001.result: Removed end tab mysql-test/r/slave-running.result: Removed end tab mysql-test/r/slave-stopped.result: Removed end tab mysql-test/t/bdb.test: Check that we have BDB support mysql-test/t/replace.test: Check if we support ISAM tables sql/gen_lex_hash.cc: Fixed bug in last output sql/ha_berkeley.cc: Bug fix sql/ha_berkeley.h: Initialize using_ignore sql/handler.h: Fixed typo sql/mysqld.cc: Fixed typos; Added variable 'have_isam' sql/sql_class.h: Fixed typo BitKeeper/etc/ignore: Added sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686 to the ignore list --- mysql-test/r/mrg000001.result | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mysql-test/r/mrg000001.result') diff --git a/mysql-test/r/mrg000001.result b/mysql-test/r/mrg000001.result index 8b351ebe780..97dc723f349 100644 --- a/mysql-test/r/mrg000001.result +++ b/mysql-test/r/mrg000001.result @@ -1,5 +1,5 @@ -incr othr -1 10 -2 24 -4 33 -3 53 +incr othr +1 10 +2 24 +4 33 +3 53 -- cgit v1.2.1