Extended mysqltest with --commands and 'require'

Fixed test results.
Added mysqld variable 'have_isam'

.bzrignore

@@ -183,3 +183,4 @@ mysqld.S
 mysqld.sym
 .snprj/*
 sql-bench/output/*
+sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686

Docs/manual.texi

@@ -20271,7 +20271,7 @@ differ somewhat:
 | flush                   | OFF                       |
 | flush_time              | 0                         |
 | have_bdb                | YES                       |
-| have_gemeni             | NO                        |
+| have_gemini             | NO                        |
 | have_innobase           | YES                       |
 | have_raid               | YES                       |
 | have_ssl                | NO                        |
@@ -20449,9 +20449,9 @@ very little resources.
 @item @code{have_bdb}
 @code{YES} if @code{mysqld} supports Berkeley DB tables. @code{DISABLED}
 if @code{--skip-bdb} is used.
-@item @code{have_gemeni}
-@code{YES} if @code{mysqld} supports Gemeni tables. @code{DISABLED}
-if @code{--skip-gemeni} is used.
+@item @code{have_gemini}
+@code{YES} if @code{mysqld} supports Gemini tables. @code{DISABLED}
+if @code{--skip-gemini} is used.
 @item @code{have_innobase}
 @code{YES} if @code{mysqld} supports Innobase tables. @code{DISABLED}
 if @code{--skip-innobase} is used.
@@ -40052,7 +40052,7 @@ though, so Version 3.23 is not released as a stable version yet.
 @item
 Added option @code{--safe-show-databases}.
 @item
-Added @code{have_bdb}, @code{have_gemeni}, @code{have_innobase},
+Added @code{have_bdb}, @code{have_gemini}, @code{have_innobase},
 @code{have_raid} and @code{have_ssl} to @code{SHOW VARIABLES} to make it
 easy to test for supported extensions.
 @item

configure.in

@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
-AM_INIT_AUTOMAKE(mysql, 3.23.29a-gamma)
+AM_INIT_AUTOMAKE(mysql, 3.23.30-gamma)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10

myisam/myisamlog.c

@@ -393,7 +393,7 @@ static int examine_log(my_string file_name, char **table_names)
 	char *pos,*to;
 
 	/* Fix if old DOS files to new format */
-	for (pos=file_info.name; pos=strchr(pos,'\\') ; pos++)
+	for (pos=file_info.name; (pos=strchr(pos,'\\')) ; pos++)
 	  *pos= '/';
 
 	pos=file_info.name;

mysql-test/include/have_bdb.inc

+-- require r/have_bdb.require
+show variables like "have_bdb";

mysql-test/include/have_isam.inc

+-- require r/have_isam.require
+show variables like "have_isam";

mysql-test/mysql-test-run.sh

@@ -189,6 +189,10 @@ fail_inc () {
     TOT_FAIL=`$EXPR $TOT_FAIL + 1`
 }
 
+skip_inc () {
+    TOT_SKIP=`$EXPR $TOT_SKIP + 1`
+}
+
 total_inc () {
     TOT_TEST=`$EXPR $TOT_TEST + 1`
 }
@@ -463,9 +467,14 @@ run_testcase ()
 	$SETCOLOR_NORMAL && $ECHO -n "$pname          $timestr"
 
 
-	total_inc
 
-    if [ $res != 0 ]; then
+    if [ $res == 0 ]; then
+      total_inc
+      pass_inc
+      echo "$RES_SPACE [ pass ]"
+    else
+      if [ $res == 1 ]; then
+	total_inc
         fail_inc
 	echo "$RES_SPACE [ fail ]"
         $ECHO "failed output"
@@ -481,12 +490,12 @@ run_testcase ()
 	echo "Restarting mysqld"
 	mysql_restart
 	echo "Resuming Tests"
-    else
-      pass_inc
-      echo "$RES_SPACE [ pass ]"
+      else
+        pass_inc
+	echo "$RES_SPACE [ skipped ]"
+      fi
     fi
   fi  
- 
 }
 
 
@@ -525,7 +534,8 @@ then
   done
  fi
 else
- tf=$TESTDIR/$1.$TESTSUFFIX
+ tname=`$BASENAME $1 .test`
+ tf=$TESTDIR/$tname.$TESTSUFFIX
  if [ -f $tf ] ; then
   run_testcase $tf
  else

mysql-test/r/alt000001.result

-n	
-3	
-9	
-10	
-12	
+n
+3
+9
+10
+12

mysql-test/r/bdb.result

-id	code	name	
-1	1	Tim	
-2	1	Monty	
-3	2	David	
-4	2	Erik	
-5	3	Sasha	
-6	3	Jeremy	
-7	4	Matt	
-id	code	name	
-2	1	Monty	
-3	2	David	
-4	2	Erik	
-5	3	Sasha	
-6	3	Jeremy	
-7	4	Matt	
-8	1	Sinisa	
-id	code	name	
-3	2	David	
-4	2	Erik	
-5	3	Sasha	
-6	3	Jeremy	
-7	4	Matt	
-8	1	Sinisa	
-12	1	Ralph	
+id	code	name
+1	1	Tim
+2	1	Monty
+3	2	David
+4	2	Erik
+5	3	Sasha
+6	3	Jeremy
+7	4	Matt
+id	code	name
+2	1	Monty
+3	2	David
+4	2	Erik
+5	3	Sasha
+6	3	Jeremy
+7	4	Matt
+8	1	Sinisa
+id	code	name
+3	2	David
+4	2	Erik
+5	3	Sasha
+6	3	Jeremy
+7	4	Matt
+8	1	Sinisa
+12	1	Ralph
+gesuchnr	benutzer_id
+1	1
+2	1

mysql-test/r/crypt.result

-encrypt('foo', 'ff')	
-ffTU0fyIP09Z.	
+encrypt('foo', 'ff')
+ffTU0fyIP09Z.

mysql-test/r/equal.result

-0<=>0	0.0<=>0.0	"A"<=>"A"	NULL<=>NULL	
-1	1	1	1	
-1<=>0	0<=>NULL	NULL<=>0	
-0	0	0	
-1.0<=>0.0	0.0<=>NULL	NULL<=>0.0	
-0	0	0	
-"A"<=>"B"	"A"<=>NULL	NULL<=>"A"	
-0	0	0	
-id	value	id	value	t1.value<=>t2.value	
-1	NULL	1	NULL	1	
-id	value	
-1	NULL	
-id	value	
-1	NULL	
-id	value	
+0<=>0	0.0<=>0.0	"A"<=>"A"	NULL<=>NULL
+1	1	1	1
+1<=>0	0<=>NULL	NULL<=>0
+0	0	0
+1.0<=>0.0	0.0<=>NULL	NULL<=>0.0
+0	0	0
+"A"<=>"B"	"A"<=>NULL	NULL<=>"A"
+0	0	0
+id	value	id	value	t1.value<=>t2.value
+1	NULL	1	NULL	1
+id	value
+1	NULL
+id	value
+1	NULL
+id	value

mysql-test/r/ft0000001.a.result

-a	MATCH (message) AGAINST ('steve')	
-4	0.90587321329654	
-7	0.89568988462614	
+a	MATCH (message) AGAINST ('steve')
+4	0.90587321329654
+7	0.89568988462614

mysql-test/r/ft0000001.b.result

-a	MATCH (message) AGAINST ('steve')	
-4	0.90587321329654	
-7	0.89568988462614	
+a	MATCH (message) AGAINST ('steve')
+4	0.90587321329654
+7	0.89568988462614

mysql-test/r/ft0000001.c.result

-a	MATCH (message) AGAINST ('steve')	
-7	0.89568988462614	
-4	0.90587321329654	
+a	MATCH (message) AGAINST ('steve')
+7	0.89568988462614
+4	0.90587321329654

mysql-test/r/ft0000001.d.result

-a	MATCH (message) AGAINST ('steve')	
-7	0.89568988462614	
+a	MATCH (message) AGAINST ('steve')
+7	0.89568988462614

mysql-test/r/ft0000001.e.result

-a	rel	
-1	0	
-2	0	
-3	0	
-5	0	
-6	0	
-7	0.89568988462614	
-4	0.90587321329654	
+a	rel
+1	0
+2	0
+3	0
+5	0
+6	0
+7	0.89568988462614
+4	0.90587321329654

mysql-test/r/ft0000002.a.result

-a	MATCH  b  AGAINST ('lala lkjh')	
-1	0.67003110026735	
-2	0	
-3	0	
+a	MATCH  b  AGAINST ('lala lkjh')
+1	0.67003110026735
+2	0
+3	0

mysql-test/r/ft0000002.b.result

-a	MATCH  c  AGAINST ('lala lkjh')	
-1	0	
-2	0.67756324121582	
-3	0	
+a	MATCH  c  AGAINST ('lala lkjh')
+1	0
+2	0.67756324121582
+3	0

mysql-test/r/ft0000002.c.result

-a	MATCH b,c AGAINST ('lala lkjh')	
-1	0.64840710366884	
-2	0.66266459031789	
-3	0	
+a	MATCH b,c AGAINST ('lala lkjh')
+1	0.64840710366884
+2	0.66266459031789
+3	0

mysql-test/r/have_bdb.require

+Variable_name	Value
+have_bdb	YES

mysql-test/r/have_isam.require

+Variable_name	Value
+have_isam	YES

mysql-test/r/ins000001.result

-id	domain	
-1	mysql.com	
-2	hotmail.com	
-3	aol.com	
+id	domain
+1	mysql.com
+2	hotmail.com
+3	aol.com

mysql-test/r/mrg000001.dummy.result

-incr	othr	
+incr	othr

mysql-test/r/mrg000001.result

-incr	othr	
-1	10	
-2	24	
-4	33	
-3	53	
+incr	othr
+1	10
+2	24
+4	33
+3	53

mysql-test/r/mrg000002.result

-c	
+c

mysql-test/r/rpl000001.a.result

-n	
-1	
-2	
+n
+1
+2

mysql-test/r/rpl000001.b.result

-sum(length(word))	
-71	
+sum(length(word))
+71

mysql-test/r/rpl000002.result

-n	
-2000	
-2001	
-2002	
+n
+2000
+2001
+2002

mysql-test/r/rpl000003.result

-n	
-1	
-2	
-3	
+n
+1
+2
+3

mysql-test/r/rpl000004.a.result

-Table	Op	Msg_type	Msg_text	
-test.words	check	status	OK	
+Table	Op	Msg_type	Msg_text
+test.words	check	status	OK

mysql-test/r/rpl000004.b.result

-count(*)	
-10	
+count(*)
+10

mysql-test/r/rpl000005.result

-name	age	id	
-Andy	31	00000001	
-Jacob	2	00000002	
-Caleb	1	00000003	
+name	age	id
+Andy	31	00000001
+Jacob	2	00000002
+Caleb	1	00000003

mysql-test/r/rpl000006.result

-unix_timestamp(t)	
-200006	
+unix_timestamp(t)
+200006

mysql-test/r/rpl000007.result

-n	m	
-4	15	
+n	m
+4	15

mysql-test/r/rpl000008.result

-n	m	k	
-4	15	55	
+n	m	k
+4	15	55

mysql-test/r/rpl000009.result

-n	m	
-4	15	
+n	m
+4	15

mysql-test/r/rpl000010.result

-n	
-1	
-2	
+n
+1
+2

mysql-test/r/rpl000011.result

-n	
-1	
-2	
+n
+1
+2

mysql-test/r/rpl000012.result

-n	
-1	
-2	
-3	
-4	
-5	
-6	
+n
+1
+2
+3
+4
+5
+6

mysql-test/r/rpl000012.status.result

-Variable_name	Value	
-Slave_open_temp_tables	0	
+Variable_name	Value
+Slave_open_temp_tables	0

mysql-test/r/rpl000013.result

-n	
-1	
-2	
-3	
-4	
-5	
-6	
+n
+1
+2
+3
+4
+5
+6

mysql-test/r/rpl000013.status.result

-Variable_name	Value	
-Slave_open_temp_tables	0	
+Variable_name	Value
+Slave_open_temp_tables	0

mysql-test/r/rpl000014.result

-File	Position	Binlog_do_db	Binlog_ignore_db	
-master-bin.001	73			
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	
-127.0.0.1	root	9306	1		73	Yes			
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	
-127.0.0.1	root	9306	1		73	No			
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	
-127.0.0.1	root	9306	1		73	Yes			
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	
-127.0.0.1	root	9306	1		173	Yes			
-File	Position	Binlog_do_db	Binlog_ignore_db	
-master-bin.001	73			
-n	
-1	
-2	
-3	
+File	Position	Binlog_do_db	Binlog_ignore_db
+master-bin.001	73		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
+127.0.0.1	root	9306	1		73	Yes		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
+127.0.0.1	root	9306	1		73	No		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
+127.0.0.1	root	9306	1		73	Yes		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
+127.0.0.1	root	9306	1		173	Yes		
+File	Position	Binlog_do_db	Binlog_ignore_db
+master-bin.001	73		
+n
+1
+2
+3

mysql-test/r/rpl000015.result

-File	Position	Binlog_do_db	Binlog_ignore_db	
-master-bin.001	73			
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	
-		0	0		0	No			
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	
-127.0.0.1	test	3306	60		4	No			
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	
-127.0.0.1	root	9306	60		4	No			
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	
-127.0.0.1	root	9306	60		4	Yes			
-n	
-10	
-45	
-90	
+File	Position	Binlog_do_db	Binlog_ignore_db
+master-bin.001	73		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
+		0	0		0	No		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
+127.0.0.1	test	3306	60		4	No		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
+127.0.0.1	root	9306	60		4	No		
+Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db
+127.0.0.1	root	9306	60		4	Yes		
+n
+10
+45
+90

mysql-test/r/rpl000016.result

-s	
-Could not break slave	
-Tried hard	
-Log_name	
-master-bin.001	
-master-bin.002	
-master-bin.003	
-Log_name	
-master-bin.003	
-m	
-34	
-67	
-123	
-65	
+s
+Could not break slave
+Tried hard
+Log_name
+master-bin.001
+master-bin.002
+master-bin.003
+Log_name
+master-bin.003
+m
+34
+67
+123
+65

mysql-test/r/sel000001.result

-s	id	
-mouse	3	
+s	id
+mouse	3

mysql-test/r/sel000002.result

-n	
-1	
-2	
-3	
+n
+1
+2
+3

mysql-test/r/sel000003.result

-n	score	
-4	10	
-2	20	
+n	score
+4	10
+2	20

mysql-test/r/sel000004.result

-1+1	1-1	1+1*2	8/5	8%5	MOD(8,5)	MOD(8,5)|0	-(1+1)*-2	SIGN(-5)	
-2	0	3	1.60	3	3	3	4	-1	
+1+1	1-1	1+1*2	8/5	8%5	MOD(8,5)	MOD(8,5)|0	-(1+1)*-2	SIGN(-5)
+2	0	3	1.60	3	3	3	4	-1

mysql-test/r/sel000005.result

-FLOOR(5.5)	FLOOR(-5.5)	CEILING(5.5)	CEILING(-5.5)	ROUND(5.5)	ROUND(-5.5)	
-5	-6	6	-5	6	-6	
+FLOOR(5.5)	FLOOR(-5.5)	CEILING(5.5)	CEILING(-5.5)	ROUND(5.5)	ROUND(-5.5)
+5	-6	6	-5	6	-6

mysql-test/r/sel000006.result

-ROUND(5.64,1)	ROUND(5.64,2)	ROUND(5.64,-1)	ROUND(5.64,-2)	
-5.6	5.64	10	0	
+ROUND(5.64,1)	ROUND(5.64,2)	ROUND(5.64,-1)	ROUND(5.64,-2)
+5.6	5.64	10	0

mysql-test/r/sel000007.result

-TRUNCATE(52.64,1)	TRUNCATE(52.64,2)	TRUNCATE(52.64,-1)	TRUNCATE(52.64,-2)	
-52.6	52.64	50	0	
+TRUNCATE(52.64,1)	TRUNCATE(52.64,2)	TRUNCATE(52.64,-1)	TRUNCATE(52.64,-2)
+52.6	52.64	50	0

mysql-test/r/sel000008.result

-ABS(-10)	LOG(EXP(10))	EXP(LOG(SQRT(10))*2)	POW(10,LOG10(10))	RAND(999999)	RAND()	POWER(2,4)	
-10	10.000000	10.000000	10.000000	0.18435012473199	0.76373626176616	16.000000	
+ABS(-10)	LOG(EXP(10))	EXP(LOG(SQRT(10))*2)	POW(10,LOG10(10))	RAND(999999)	RAND()	POWER(2,4)
+10	10.000000	10.000000	10.000000	0.18435012473199	0.76373626176616	16.000000

mysql-test/r/sel000009.result

-PI()	SIN(PI()/2)	COS(PI()/2)	TAN(PI())	COT(1)	ASIN(1)	ACOS(0)	ATAN(1)	
-3.141593	1.000000	0.000000	-0.000000	0.64209262	1.570796	1.570796	0.785398	
+PI()	SIN(PI()/2)	COS(PI()/2)	TAN(PI())	COT(1)	ASIN(1)	ACOS(0)	ATAN(1)
+3.141593	1.000000	0.000000	-0.000000	0.64209262	1.570796	1.570796	0.785398

mysql-test/r/sel000010.result

-1 | (1+1)	5 & 3	BIT_COUNT(7)	
-3	1	3	
+1 | (1+1)	5 & 3	BIT_COUNT(7)
+3	1	3

mysql-test/r/sel000011.result

-1 << 32	1 << 63	1 << 64	4 >> 2	4 >> 63	1<< 63 >> 60	
-4294967296	-9223372036854775808	0	1	0	8	
+1 << 32	1 << 63	1 << 64	4 >> 2	4 >> 63	1<< 63 >> 60
+4294967296	-9223372036854775808	0	1	0	8

mysql-test/r/sel000012.result

-10	10.0	10.	.1e+2	100.0e-1	
-10	10.0	10	10	10	
+10	10.0	10.	.1e+2	100.0e-1
+10	10.0	10	10	10

mysql-test/r/sel000013.result

-6e-05	-6e-05	--6e-05	-6e-05+1.000000	
-6e-05	-6e-05	6e-05	0.99994	
+6e-05	-6e-05	--6e-05	-6e-05+1.000000
+6e-05	-6e-05	6e-05	0.99994

mysql-test/r/sel000014.result

-0	256	00000000000000065536	2147483647	-2147483648	2147483648	+4294967296	
-0	256	65536	2147483647	-2147483648	2147483648	4294967296	
+0	256	00000000000000065536	2147483647	-2147483648	2147483648	+4294967296
+0	256	65536	2147483647	-2147483648	2147483648	4294967296

mysql-test/r/sel000015.result

-922337203685477580	92233720368547758000	
-922337203685477580	92233720368547758080	
+922337203685477580	92233720368547758000
+922337203685477580	92233720368547758080

mysql-test/r/sel000016.result

--922337203685477580	-92233720368547758000	
--922337203685477580	-92233720368547758080	
+-922337203685477580	-92233720368547758000
+-922337203685477580	-92233720368547758080

mysql-test/r/sel000017.result

-9223372036854775807	-009223372036854775808	
-9223372036854775807	-9223372036854775808	
+9223372036854775807	-009223372036854775808
+9223372036854775807	-9223372036854775808

mysql-test/r/sel000018.result

-+9999999999999999999	-9999999999999999999	
-10000000000000000000	-10000000000000000000	
++9999999999999999999	-9999999999999999999
+10000000000000000000	-10000000000000000000

mysql-test/r/sel000019.result

-DEGREES(PI())	RADIANS(360)	
-180	6.2831853071796	
+DEGREES(PI())	RADIANS(360)
+180	6.2831853071796

mysql-test/r/sel000020.result

-0=0	1>0	1>=1	1<0	1<=0	1!=0	STRCMP("abc","abcd")	STRCMP("b","a")	STRCMP("a","a")	
-1	1	1	0	0	1	-1	1	0	
+0=0	1>0	1>=1	1<0	1<=0	1!=0	STRCMP("abc","abcd")	STRCMP("b","a")	STRCMP("a","a")
+1	1	1	0	0	1	-1	1	0

mysql-test/r/sel000021.result

-"a"<"b"	"a"<="b"	"b">="a"	"b">"a"	"a"="A"	"a"<>"b"	
-1	1	1	1	1	1	
+"a"<"b"	"a"<="b"	"b">="a"	"b">"a"	"a"="A"	"a"<>"b"
+1	1	1	1	1	1

mysql-test/r/sel000022.result

-"a "="A"	"A "="a"	"a  " <= "A b"	
-1	1	1	
+"a "="A"	"A "="a"	"a  " <= "A b"
+1	1	1

mysql-test/r/sel000023.result

-"abc" LIKE "a%"	"abc" NOT LIKE "%d%"	"a%" LIKE "a\%"	"abc%" LIKE "a%\%"	"abcd" LIKE "a%b_%d"	"a" LIKE "%%a"	"abcde" LIKE "a%_e"	"abc" LIKE "abc%"	
-1	1	1	1	1	1	1	1	
+"abc" LIKE "a%"	"abc" NOT LIKE "%d%"	"a%" LIKE "a\%"	"abc%" LIKE "a%\%"	"abcd" LIKE "a%b_%d"	"a" LIKE "%%a"	"abcde" LIKE "a%_e"	"abc" LIKE "abc%"
+1	1	1	1	1	1	1	1

mysql-test/r/sel000024.result

-"a" LIKE "%%b"	"a" LIKE "%%ab"	"ab" LIKE "a\%"	"ab" LIKE "_"	"ab" LIKE "ab_"	"abc" LIKE "%_d"	"abc" LIKE "abc%d"	
-0	0	0	0	0	0	0	
+"a" LIKE "%%b"	"a" LIKE "%%ab"	"ab" LIKE "a\%"	"ab" LIKE "_"	"ab" LIKE "ab_"	"abc" LIKE "%_d"	"abc" LIKE "abc%d"
+0	0	0	0	0	0	0

mysql-test/r/sel000025.result

-'?' LIKE '|%'	'?' LIKE '|%' ESCAPE '|'	'%' LIKE '|%'	'%' LIKE '|%' ESCAPE '|'	'%' LIKE '%'	
-0	0	0	1	1	
+'?' LIKE '|%'	'?' LIKE '|%' ESCAPE '|'	'%' LIKE '|%'	'%' LIKE '|%' ESCAPE '|'	'%' LIKE '%'
+0	0	0	1	1

mysql-test/r/sel000026.result

-'abc' LIKE '%c'	'abcabc' LIKE '%c'	"ab" LIKE ""	"ab" LIKE "a"	"ab" LIKE "ab"	
-1	1	0	0	1	
+'abc' LIKE '%c'	'abcabc' LIKE '%c'	"ab" LIKE ""	"ab" LIKE "a"	"ab" LIKE "ab"
+1	1	0	0	1

mysql-test/r/sel000027.result

-"Det här är svenska" REGEXP "h[[:alpha:]]+r"	"aba" REGEXP "^(a|b)*$"	
-1	1	
+"Det här är svenska" REGEXP "h[[:alpha:]]+r"	"aba" REGEXP "^(a|b)*$"
+1	1

mysql-test/r/sel000028.result

-"aba" REGEXP CONCAT("^","a")	
-1	
+"aba" REGEXP CONCAT("^","a")
+1

mysql-test/r/sel000029.result

-!0	NOT 0=1	!(0=0)	1 AND 1	1 && 0	0 OR 1	1 || NULL	1=1 OR 1=1 AND 1=0	
-1	1	0	1	0	1	1	1	
+!0	NOT 0=1	!(0=0)	1 AND 1	1 && 0	0 OR 1	1 || NULL	1=1 OR 1=1 AND 1=0
+1	1	0	1	0	1	1	1

mysql-test/r/sel000030.result

-IF(0,"ERROR","this")	IF(1,"is","ERROR")	IF(NULL,"ERROR","a")	IF(1,2,3)|0	IF(1,2.0,3.0)+0	
-this	is	a	2	2.0	
+IF(0,"ERROR","this")	IF(1,"is","ERROR")	IF(NULL,"ERROR","a")	IF(1,2,3)|0	IF(1,2.0,3.0)+0
+this	is	a	2	2.0

mysql-test/r/sel000031.result

-id	elt(two.val,'one','two')	
-1	one	
-2	one	
-4	two	
+id	elt(two.val,'one','two')
+1	one
+2	one
+4	two

mysql-test/r/sel000032.result

-id	elt(two.val,'one','two')	
-1	one	
-2	one	
-4	two	
+id	elt(two.val,'one','two')
+1	one
+2	one
+4	two

mysql-test/r/sel000033.result

-id	
-2	
-5	
-9	
+id
+2
+5
+9

mysql-test/r/sel000100.result

-key_link_id	link	
-NULL	NULL	
+key_link_id	link
+NULL	NULL

mysql-test/r/shw000001.result

-Table	Create Table	
+Table	Create Table
 test	CREATE TABLE `test` (
   `test_set` set('val1','val2','val3') NOT NULL default '',
   `name` char(20) default 'O''Brien'
-) TYPE=MyISAM COMMENT='it''s a table'	
+) TYPE=MyISAM COMMENT='it''s a table'

mysql-test/r/slave-running.result

-Variable_name	Value	
-Slave_running	ON	
+Variable_name	Value
+Slave_running	ON

mysql-test/r/slave-stopped.result

-Variable_name	Value	
-Slave_running	OFF	
+Variable_name	Value
+Slave_running	OFF

mysql-test/t/bdb.test

+-- source include/have_bdb.inc
+
 drop table if exists t1;
 create table t1 (id int unsigned not null auto_increment, code tinyint unsigned not null, name char(20) not null, primary key (id), key (code), unique (name)) type=bdb;
 
@@ -10,3 +12,19 @@ update ignore t1 set id = id + 10, name = 'Ralph' where id < 4;
 select id, code, name from t1 order by id;
 
 drop table t1;
+
+#
+# Test replace
+#
+
+CREATE TABLE t1 (
+  gesuchnr int(11) DEFAULT '0' NOT NULL,
+  benutzer_id int(11) DEFAULT '0' NOT NULL,
+  PRIMARY KEY (gesuchnr,benutzer_id)
+) type=BDB;
+
+replace into t1 (gesuchnr,benutzer_id) values (2,1);
+replace into t1 (gesuchnr,benutzer_id) values (1,1);
+replace into t1 (gesuchnr,benutzer_id) values (1,1);
+select * from t1;
+drop table t1;

mysql-test/t/include/master-slave.inc

-connect (master,localhost,root,,test,0,var/tmp/mysql.sock);
-connect (master1,localhost,root,,test,0,var/tmp/mysql.sock);
-connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock);
-connect (slave1,localhost,root,,test,0,var/tmp/mysql-slave.sock);
-connection slave;
-!slave stop;
-connection master;
-reset master;
-connection slave;
-reset slave;
-!slave start;

mysql-test/t/replace.test

+-- source include/have_isam.inc
+
 #
-# Test of REPLACE with ISAM and MyISAM and BDB
+# Test of REPLACE with ISAM and MyISAM and HEAP
 #
 
 drop table if exists t1;
@@ -15,8 +17,6 @@ replace into t1 (gesuchnr,benutzer_id) values (1,1);
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
 alter table t1 type=myisam;
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
-alter table t1 type=bdb;
-replace into t1 (gesuchnr,benutzer_id) values (1,1);
 alter table t1 type=heap;
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
 drop table t1;

sql/gen_lex_hash.cc

@@ -330,7 +330,7 @@ static struct option long_options[] =
 
 static void usage(int version)
 {
-  printf("%s  Ver 3.1 Distrib %s, for %s (%s)\n",
+  printf("%s  Ver 3.2 Distrib %s, for %s (%s)\n",
 	 my_progname, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
   if (version)
     return;
@@ -350,7 +350,7 @@ static void usage(int version)
 }
 
 static uint best_type;
-static ulong best_t1,best_t2;
+static ulong best_t1,best_t2, best_start_value;
 
 static int get_options(int argc, char **argv)
 {
@@ -510,8 +510,10 @@ int main(int argc,char **argv)
 	best_mod=function_mod; best_add=function_plus;
 	best_functype=function_type;
 	best_t1=t1; best_t2=t2; best_type=type;
-	printf("\nstart_value=%ldL; best_t1=%ldL;  best_t2=%ldL;  best_type=%d; /* mode=%d  add=%d  func_type: %d */\n",
-	       start_value,best_t1,best_t2,best_type,best_mod,best_add,best_functype);
+	best_start_value=start_value;
+	printf("\nstart_value=%ldL; best_t1=%ldL;  best_t2=%ldL;  best_type=%d; /* mode=%d  add=%d  type: %d */\n",
+	       best_start_value,best_t1,best_t2,best_type,best_mod,best_add,
+	       best_functype);
       }
     }
   }
@@ -537,8 +539,8 @@ printf("/* This code is generated by gen_lex_hash.cc that seeks for a perfect\nh
 
   print_arrays();
 
-  printf("/* start_value=%ldL;  best_t1=%ldL;  best_t2=%ldL;  best_type=%d; */ /* mode=%d  add=%d type: %d */\n\n",
-	 start_value, best_t1, best_t2,best_type,
+  printf("/* start_value=%ldL;  best_t1=%ldL;  best_t2=%ldL;  best_type=%d; */ /* mode=%d  add=%d t ype: %d */\n\n",
+	 best_start_value, best_t1, best_t2, best_type,
 	 best_mod, best_add, best_functype);
 
   printf("inline SYMBOL *get_hash_symbol(const char *s,unsigned int length,bool function)\n\

sql/ha_berkeley.cc

@@ -89,7 +89,7 @@ static DB_ENV *db_env;
 static HASH bdb_open_tables;
 
 const char *berkeley_lock_names[] =
-{ "DEFAULT", "OLDEST","RANDOM","YOUNGEST" };
+{ "DEFAULT", "OLDEST","RANDOM","YOUNGEST",0 };
 u_int32_t berkeley_lock_types[]=
 { DB_LOCK_DEFAULT, DB_LOCK_OLDEST, DB_LOCK_RANDOM };
 TYPELIB berkeley_lock_typelib= {array_elements(berkeley_lock_names),"",

sql/ha_berkeley.h

@@ -91,7 +91,7 @@ class ha_berkeley: public handler
 		    HA_BLOB_KEY | HA_NOT_EXACT_COUNT |
 		    HA_PRIMARY_KEY_IN_READ_INDEX | HA_DROP_BEFORE_CREATE |
 		    HA_AUTO_PART_KEY),
-    last_dup_key((uint) -1),version(0)
+    last_dup_key((uint) -1),version(0),using_ignore(0)
   {
   }
   ~ha_berkeley() {}

sql/handler.h

@@ -25,7 +25,7 @@
 #define NO_HASH				/* Not yet implemented */
 #endif
 
-#if defined(HAVE_BERKELEY_DB) || defined(HAVE_INNOBASE_DB) || defined(HAVE_GEMENI_DB)
+#if defined(HAVE_BERKELEY_DB) || defined(HAVE_INNOBASE_DB) || defined(HAVE_GEMINI_DB)
 #define USING_TRANSACTIONS
 #endif
 
@@ -121,7 +121,7 @@ enum row_type { ROW_TYPE_DEFAULT, ROW_TYPE_FIXED, ROW_TYPE_DYNAMIC,
 typedef struct st_thd_trans {
   void *bdb_tid;
   void *innobase_tid;
-  void *gemeni_tid;
+  void *gemini_tid;
 } THD_TRANS;
 
 typedef struct st_ha_create_information

sql/mysqld.cc

@@ -151,16 +151,21 @@ SHOW_COMP_OPTION have_berkeley_db=SHOW_OPTION_YES;
 #else
 SHOW_COMP_OPTION have_berkeley_db=SHOW_OPTION_NO;
 #endif
-#ifdef HAVE_GEMENI_DB
-SHOW_COMP_OPTION have_gemeni=SHOW_OPTION_YES;
+#ifdef HAVE_GEMINI_DB
+SHOW_COMP_OPTION have_gemini=SHOW_OPTION_YES;
 #else
-SHOW_COMP_OPTION have_gemeni=SHOW_OPTION_NO;
+SHOW_COMP_OPTION have_gemini=SHOW_OPTION_NO;
 #endif
 #ifdef HAVE_INNOBASE_DB
 SHOW_COMP_OPTION have_innobase=SHOW_OPTION_YES;
 #else
 SHOW_COMP_OPTION have_innobase=SHOW_OPTION_NO;
 #endif
+#ifndef NO_ISAM
+SHOW_COMP_OPTION have_isam=SHOW_OPTION_YES;
+#else
+SHOW_COMP_OPTION have_isam=SHOW_OPTION_NO;
+#endif
 #ifdef USE_RAID
 SHOW_COMP_OPTION have_raid=SHOW_OPTION_YES;
 #else
@@ -1077,26 +1082,26 @@ inline static __volatile__ void  trace_stack()
   uchar **stack_bottom;
   uchar** ebp;
   LINT_INIT(ebp);
-  fprintf(stderr, "Attemping backtrace, please send the info below to\
- bugs@lists.mysql.com. If you see no messages after this, something  \
- went terribly wrong - report this anyway\n");
+  fprintf(stderr, "Attemping backtrace, please send the info below to \
+bugs@lists.mysql.com. If you see no messages after this, something \
+went terribly wrong - report this anyway\n");
   THD* thd = current_thd;
   uint frame_count = 0;
   __asm __volatile__ ("movl %%ebp,%0"
 		      :"=r"(ebp)
 		      :"r"(ebp));
-  if(!ebp)
-    {
-      fprintf(stderr, "frame pointer (ebp) is NULL, did you compile with \
- -fomit-frame-pointer? Aborting backtrace\n");
-      return;
-    }
-  if(!thd)
-    {
-      fprintf(stderr, "Cannot determine thread, ebp=%p, aborting backtrace\n",
-	      ebp);
-      return;
-    }
+  if (!ebp)
+  {
+    fprintf(stderr, "frame pointer (ebp) is NULL, did you compile with \
+-fomit-frame-pointer? Aborting backtrace\n");
+    return;
+  }
+  if (!thd)
+  {
+    fprintf(stderr, "Cannot determine thread, ebp=%p, aborting backtrace\n",
+	    ebp);
+    return;
+  }
   stack_bottom = (uchar**)thd->thread_stack;
   if(ebp > stack_bottom || ebp < stack_bottom - thread_stack)
   {
@@ -1107,20 +1112,20 @@ inline static __volatile__ void  trace_stack()
 
   fprintf(stderr, "stack range sanity check, ok, backtrace follows\n");
   
-  while(ebp < stack_bottom)
+  while (ebp < stack_bottom)
+  {
+    uchar** new_ebp = (uchar**)*ebp;
+    fprintf(stderr, "%p\n", frame_count == SIGRETURN_FRAME_COUNT ?
+	    *(ebp+17) : *(ebp+1));
+    if (new_ebp <= ebp )
     {
-      uchar** new_ebp = (uchar**)*ebp;
-      fprintf(stderr, "%p\n", frame_count == SIGRETURN_FRAME_COUNT ?
-	      *(ebp+17) : *(ebp+1));
-      if(new_ebp <= ebp )
-	{
-	  fprintf(stderr, "New value of ebp failed sanity check\
+      fprintf(stderr, "New value of ebp failed sanity check\
 terminating backtrace\n");
-	  return;
-	}
-      ebp = new_ebp;
-      ++frame_count;
+      return;
     }
+    ebp = new_ebp;
+    ++frame_count;
+  }
 
   fprintf(stderr, "stack trace successful\n"); 
 }
@@ -1133,31 +1138,27 @@ static sig_handler handle_segfault(int sig)
   // but since we have got SIGSEGV already, things are a mess
   // so not having the mutex is not as bad as possibly using a buggy
   // mutex - so we keep things simple
-  if(segfaulted)
+  if (segfaulted)
     return;
   segfaulted = 1;
   fprintf(stderr,"\
-mysqld got signal %s in thread %d;  \n\
+mysqld got signal %d;\n\
 The manual section 'Debugging a MySQL server' tells you how to use a \n\
 debugger on the core file to produce a backtrace that may help you find out\n\
-why mysqld died\n",sys_siglist[sig],getpid());
-#if defined(HAVE_LINUXTHREADS) && defined(__i386__)
+why mysqld died\n",sig);
+#if defined(HAVE_LINUXTHREADS)
+#ifdef __i386__
   trace_stack();
-#endif
-#ifdef HAVE_LINUXTHREADS
+#endif /* __i386__ */
  if (test_flags & TEST_CORE_ON_SIGNAL)
    write_core(sig);
- else
-   exit(1);
-#else  
-  exit(1); /* abort everything */
-#endif
+#endif /* HAVE_LINUXTHREADS */
+ exit(1);
 }
 
-#ifdef HAVE_LINUXTHREADS
-
 /* Produce a core for the thread */
 
+#ifdef HAVE_LINUXTHREADS
 static sig_handler write_core(int sig)
 {
   signal(sig, SIG_DFL);
@@ -1756,7 +1757,7 @@ The server will not act as a slave");
   if (master_host)
   {
     pthread_t hThread;
-    if(!opt_skip_slave_start &&
+    if (!opt_skip_slave_start &&
        pthread_create(&hThread, &connection_attrib, handle_slave, 0))
       sql_print_error("Warning: Can't create thread to handle slave");
     else if(opt_skip_slave_start)
@@ -2623,8 +2624,9 @@ struct show_var_st init_vars[]= {
   {"flush",                   (char*) &myisam_flush,                SHOW_MY_BOOL},
   {"flush_time",              (char*) &flush_time,                  SHOW_LONG},
   {"have_bdb",		      (char*) &have_berkeley_db,	    SHOW_HAVE},
-  {"have_gemeni",	      (char*) &have_gemeni,		    SHOW_HAVE},
+  {"have_gemini",	      (char*) &have_gemini,		    SHOW_HAVE},
   {"have_innobase",	      (char*) &have_innobase,		    SHOW_HAVE},
+  {"have_isam",	      	      (char*) &have_isam,		    SHOW_HAVE},
   {"have_raid",		      (char*) &have_raid,		    SHOW_HAVE},
   {"have_ssl",		      (char*) &have_ssl,		    SHOW_HAVE},
   {"init_file",               (char*) &opt_init_file,               SHOW_CHAR_PTR},
@@ -3101,7 +3103,7 @@ static void get_options(int argc,char **argv)
       {
 	char* key = optarg,*p, *val;
 	p = strstr(optarg, "->");
-	if(!p)
+	if (!p)
 	  {
 	    fprintf(stderr,
 		    "bad syntax in replicate-rewrite-db - missing ->\n");
@@ -3118,7 +3120,7 @@ static void get_options(int argc,char **argv)
 	*val = 0;
 	val += 2;
 	while(*val && isspace(*val)) *val++;
-	if(!*val)
+	if (!*val)
 	  {
 	    fprintf(stderr,
 		    "bad syntax in replicate-rewrite-db - empty TO db\n");
@@ -3144,7 +3146,7 @@ static void get_options(int argc,char **argv)
       }
     case (int)OPT_REPLICATE_DO_TABLE:
       {
-	if(!do_table_inited)
+	if (!do_table_inited)
 	  init_table_rule_hash(&replicate_do_table, &do_table_inited);
 	if(add_table_rule(&replicate_do_table, optarg))
 	  {
@@ -3156,7 +3158,7 @@ static void get_options(int argc,char **argv)
       }
     case (int)OPT_REPLICATE_WILD_DO_TABLE:
       {
-	if(!wild_do_table_inited)
+	if (!wild_do_table_inited)
 	  init_table_rule_array(&replicate_wild_do_table,
 				&wild_do_table_inited);
 	if(add_wild_table_rule(&replicate_wild_do_table, optarg))
@@ -3169,7 +3171,7 @@ static void get_options(int argc,char **argv)
       }
     case (int)OPT_REPLICATE_WILD_IGNORE_TABLE:
       {
-	if(!wild_ignore_table_inited)
+	if (!wild_ignore_table_inited)
 	  init_table_rule_array(&replicate_wild_ignore_table,
 				&wild_ignore_table_inited);
 	if(add_wild_table_rule(&replicate_wild_ignore_table, optarg))
@@ -3182,7 +3184,7 @@ static void get_options(int argc,char **argv)
       }
     case (int)OPT_REPLICATE_IGNORE_TABLE:
       {
-	if(!ignore_table_inited)
+	if (!ignore_table_inited)
 	  init_table_rule_hash(&replicate_ignore_table, &ignore_table_inited);
 	if(add_table_rule(&replicate_ignore_table, optarg))
 	  {

sql/sql_class.h

@@ -301,7 +301,7 @@ public:
   {
     return (transaction.all.bdb_tid != 0 ||
 	    transaction.all.innobase_tid != 0 || 
-	    transaction.all.gemeni_tid != 0);
+	    transaction.all.gemini_tid != 0);
   }
   inline gptr alloc(unsigned int size) { return alloc_root(&mem_root,size); }
   inline gptr calloc(unsigned int size)