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
2025-07-30 16:24:05 +03:00 · 2000-12-27 03:31:06 +02:00
parent 74bb64d304
commit e56db85890
93 changed files with 878 additions and 819 deletions
--- a/.bzrignore
+++ b/.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
--- a/Docs/manual.texi
+++ b/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
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
--- a/configure.in
+++ b/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
--- a/myisam/myisamlog.c
+++ b/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;
--- a/mysql-test/include/have_bdb.inc
+++ b/mysql-test/include/have_bdb.inc
@ -0,0 +1,2 @@
+-- require r/have_bdb.require
+show variables like "have_bdb";
--- a/mysql-test/include/have_isam.inc
+++ b/mysql-test/include/have_isam.inc
@ -0,0 +1,2 @@
+-- require r/have_isam.require
+show variables like "have_isam";
--- a/mysql-test/mysql-test-run.sh
+++ b/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
--- a/mysql-test/r/3.23/README
+++ b/mysql-test/r/3.23/README
--- a/mysql-test/r/bdb.result
+++ b/mysql-test/r/bdb.result
@ -22,3 +22,6 @@ id	code	name
 7	4	Matt
 8	1	Sinisa
 12	1	Ralph
+gesuchnr	benutzer_id
+1	1
+2	1
--- a/mysql-test/r/have_bdb.require
+++ b/mysql-test/r/have_bdb.require
@ -0,0 +1,2 @@
+Variable_name	Value
+have_bdb	YES
--- a/mysql-test/r/have_isam.require
+++ b/mysql-test/r/have_isam.require
@ -0,0 +1,2 @@
+Variable_name	Value
+have_isam	YES
--- a/mysql-test/t/bdb.test
+++ b/mysql-test/t/bdb.test
@ -1,3 +1,5 @@
+-- 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;
--- a/mysql-test/t/include/master-slave.inc
+++ b/mysql-test/t/include/master-slave.inc
@ -1,11 +0,0 @@
-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;
--- a/mysql-test/t/replace.test
+++ b/mysql-test/t/replace.test
@ -1,5 +1,7 @@
+-- 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;
--- a/sql/gen_lex_hash.cc
+++ b/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\
--- a/sql/ha_berkeley.cc
+++ b/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),"",
--- a/sql/ha_berkeley.h
+++ b/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() {}
--- a/sql/handler.h
+++ b/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
--- a/sql/mysqld.cc
+++ b/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))
 	  {
--- a/sql/sql_class.h
+++ b/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)