Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1

into rurik.mysql.com:/home/igor/mysql-4.1

sql/mysqld.cc

@@ -29,6 +29,9 @@
 #include "ha_innodb.h"
 #endif
 #include "ha_myisam.h"
+#ifdef HAVE_ISAM
+#include "ha_isam.h"
+#endif
 #include <nisam.h>
 #include <thr_alarm.h>
 #include <ft_global.h>
@@ -318,14 +321,8 @@ my_bool	opt_console= 0, opt_bdb, opt_innodb, opt_isam;
 
 volatile bool  mqh_used = 0;
 FILE *bootstrap_file=0;
-int segfaulted = 0; // ensure we do not enter SIGSEGV handler twice
-
-/*
-  If sql_bin_update is true, SQL_LOG_UPDATE and SQL_LOG_BIN are kept in sync,
-  and are treated as aliases for each other
-*/
 
-static bool kill_in_progress=FALSE;
+static bool kill_in_progress=0, segfaulted= 0;
 struct rand_struct sql_rand; // used by sql_class.cc:THD::THD()
 static int cleanup_done;
 static char **defaults_argv;
@@ -379,7 +376,7 @@ arg_cmp_func Arg_comparator::comparator_matrix[4][2] =
  {&Arg_comparator::compare_row, &Arg_comparator::compare_e_row}};
 #ifdef HAVE_SMEM
 char *shared_memory_base_name=default_shared_memory_base_name;
-bool opt_enable_shared_memory = 0;
+my_bool opt_enable_shared_memory = 0;
 #endif
 
 volatile ulong cached_thread_count=0;
@@ -5054,12 +5051,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     if (opt_isam)
     {
       isam_skip=0;
-      isam_innodb=SHOW_OPTION_YES;
+      have_isam= SHOW_OPTION_YES;
     }
     else
     {
       isam_skip=1;
-      isam_innodb=SHOW_OPTION_DISABLED;
+      have_isam= SHOW_OPTION_DISABLED;
     }
 #endif
     break;

sql/sql_list.h

@@ -319,7 +319,8 @@ template <class T> class I_List_iterator;
 class base_ilist {
   public:
   struct ilink *first,last;
-  base_ilist() { first= &last; last.prev= &first; }
+  inline void empty() { first= &last; last.prev= &first; }
+  base_ilist() { empty(); }
   inline bool is_empty() {  return first == &last; }
   inline void append(ilink *a)
   {