bk commit into 5.0 tree (tsmith:1.2210) BUG#15195

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tim. When tim does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-19 23:45:16-06:00, tsmith@stripped +5 -0
  Partial merge from 4.1 -> 5.0 of fix for bug #15195; additional ChangeSet will be
needed to complete changes.
  MERGE: 1.1616.2144.164

  mysql-test/t/warnings.test@stripped, 2006-07-19 23:45:04-06:00, tsmith@stripped +0 -0
    Partial merge from 4.1 of fix for bug #15195; additional ChangeSet will be needed to
complete changes.
    MERGE: 1.17.1.5

  sql/handler.cc@stripped, 2006-07-19 23:45:04-06:00, tsmith@stripped +0 -2
    Partial merge from 4.1 of fix for bug #15195; additional ChangeSet will be needed to
complete changes.
    MERGE: 1.103.19.16

  sql/mysql_priv.h@stripped, 2006-07-19 23:45:04-06:00, tsmith@stripped +0 -0
    Partial merge from 4.1 of fix for bug #15195; additional ChangeSet will be needed to
complete changes.
    MERGE: 1.186.91.52

  sql/mysqld.cc@stripped, 2006-07-19 23:45:04-06:00, tsmith@stripped +5 -9
    Partial merge from 4.1 of fix for bug #15195; additional ChangeSet will be needed to
complete changes.
    MERGE: 1.356.98.26

  sql/set_var.cc@stripped, 2006-07-19 23:45:04-06:00, tsmith@stripped +0 -0
    Partial merge from 4.1 of fix for bug #15195; additional ChangeSet will be needed to
complete changes.
    MERGE: 1.34.52.39

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/merge-41-50/RESYNC

--- 1.398/sql/mysql_priv.h	2006-07-19 23:46:10 -06:00
+++ 1.399/sql/mysql_priv.h	2006-07-19 23:46:10 -06:00
@@ -1329,6 +1329,7 @@
 extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
 extern SHOW_COMP_OPTION have_crypt;
 extern SHOW_COMP_OPTION have_compress;
+extern SHOW_COMP_OPTION have_blackhole_db, have_merge_db;
 
 #ifndef __WIN__
 extern pthread_t signal_thread;

--- 1.560/sql/mysqld.cc	2006-07-19 23:46:10 -06:00
+++ 1.561/sql/mysqld.cc	2006-07-19 23:46:12 -06:00
@@ -300,7 +300,7 @@
 static bool volatile select_thread_in_use, signal_thread_in_use;
 static bool volatile ready_to_exit;
 static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0;
-static my_bool opt_bdb, opt_isam, opt_ndbcluster;
+static my_bool opt_bdb, opt_isam, opt_ndbcluster, opt_merge;
 static my_bool opt_short_log_format= 0;
 static uint kill_cached_threads, wake_thread;
 static ulong killed_threads, thread_created;
@@ -4648,7 +4648,8 @@
   OPT_OLD_STYLE_USER_LIMITS,
   OPT_LOG_SLOW_ADMIN_STATEMENTS,
   OPT_TABLE_LOCK_WAIT_TIMEOUT,
-  OPT_PORT_OPEN_TIMEOUT
+  OPT_PORT_OPEN_TIMEOUT,
+  OPT_MERGE
 };
 
 
@@ -5101,6 +5102,9 @@
 #endif /* HAVE_REPLICATION */
   {"memlock", OPT_MEMLOCK, "Lock mysqld in memory.", (gptr*) &locked_in_memory,
    (gptr*) &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"merge", OPT_MERGE, "Enable Merge storage engine. Disable with \
+--skip-merge.",
+   (gptr*) &opt_merge, (gptr*) &opt_merge, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0},
   {"myisam-recover", OPT_MYISAM_RECOVER,
    "Syntax: myisam-recover[=option[,option...]], where option can be DEFAULT, BACKUP,
FORCE or QUICK.",
    (gptr*) &myisam_recover_options_str, (gptr*) &myisam_recover_options_str, 0,
@@ -7484,6 +7488,7 @@
 *****************************************************************************/
 #undef have_berkeley_db
 #undef have_innodb
+#undef have_merge_db
 #undef have_ndbcluster
 #undef have_example_db
 #undef have_archive_db
@@ -7494,6 +7499,7 @@
 
 SHOW_COMP_OPTION have_berkeley_db= SHOW_OPTION_NO;
 SHOW_COMP_OPTION have_innodb= SHOW_OPTION_NO;
+SHOW_COMP_OPTION have_merge_db= SHOW_OPTION_NO;
 SHOW_COMP_OPTION have_ndbcluster= SHOW_OPTION_NO;
 SHOW_COMP_OPTION have_example_db= SHOW_OPTION_NO;
 SHOW_COMP_OPTION have_archive_db= SHOW_OPTION_NO;

--- 1.23/mysql-test/t/warnings.test	2006-07-19 23:46:12 -06:00
+++ 1.24/mysql-test/t/warnings.test	2006-07-19 23:46:12 -06:00
@@ -117,6 +117,10 @@
 alter table t1 engine=isam;
 drop table t1;
 
+create table t1 (id int) engine=merge;
+alter table t1 engine=merge;
+drop table t1;
+
 #
 # Test for deprecated TYPE= syntax
 #

--- 1.158/sql/set_var.cc	2006-07-19 23:46:12 -06:00
+++ 1.159/sql/set_var.cc	2006-07-19 23:46:12 -06:00
@@ -870,6 +870,7 @@
   {"have_innodb",	      (char*) &have_innodb,		    SHOW_HAVE},
   {"have_isam",		      (char*) &have_isam,		    SHOW_HAVE},
   {"have_ndbcluster",         (char*) &have_ndbcluster,             SHOW_HAVE},
+  {"have_merge_engine",       (char*) &have_merge_db,               SHOW_HAVE},
   {"have_openssl",	      (char*) &have_openssl,		    SHOW_HAVE},
   {"have_query_cache",        (char*) &have_query_cache,            SHOW_HAVE},
   {"have_raid",		      (char*) &have_raid,		    SHOW_HAVE},