Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith 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-08-03 10:41:14+02:00, tsmith@stripped +6 -0
Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-c
into maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
MERGE: 1.1810.1696.88
mysql-test/r/warnings.result@stripped, 2006-08-03 10:40:44+02:00, tsmith@stripped +7 -0
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
MERGE: 1.34.1.2
mysql-test/t/warnings.test@stripped, 2006-08-03 10:28:28+02:00, tsmith@stripped +0 -1
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
MERGE: 1.22.1.2
sql/handler.cc@stripped, 2006-08-03 10:32:17+02:00, tsmith@stripped +0 -3
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
MERGE: 1.167.1.49
sql/mysql_priv.h@stripped, 2006-08-03 10:35:09+02:00, tsmith@stripped +4 -4
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
MERGE: 1.290.1.110
sql/mysqld.cc@stripped, 2006-08-03 10:37:29+02:00, tsmith@stripped +2 -3
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
MERGE: 1.439.1.123
sql/set_var.cc@stripped, 2006-08-03 10:40:26+02:00, tsmith@stripped +2 -1
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
MERGE: 1.125.5.17
# 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: maint1.mysql.com
# Root: /data/localhome/tsmith/bk/mrg51-c/RESYNC
--- 1.423/sql/mysql_priv.h 2006-08-03 10:40:36 +02:00
+++ 1.424/sql/mysql_priv.h 2006-08-03 10:40:36 +02:00
@@ -1669,6 +1669,10 @@
extern SHOW_COMP_OPTION have_partition_db;
#endif
+extern handlerton myisammrg_hton;
+/* MRG_MYISAM handler is always built, but may be skipped */
+#define have_merge_db myisammrg_hton.state
+
extern handlerton myisam_hton;
extern handlerton myisammrg_hton;
extern handlerton heap_hton;
--- 1.572/sql/mysqld.cc 2006-08-03 10:40:36 +02:00
+++ 1.573/sql/mysqld.cc 2006-08-03 10:40:36 +02:00
@@ -310,7 +310,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;
@@ -4838,7 +4838,8 @@
OPT_LOG_OUTPUT,
OPT_PORT_OPEN_TIMEOUT,
OPT_GENERAL_LOG,
- OPT_SLOW_LOG
+ OPT_SLOW_LOG,
+ OPT_MERGE
};
@@ -5346,6 +5347,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,
@@ -7556,6 +7560,11 @@
global_system_variables.tx_isolation= (type-1);
break;
}
+ case OPT_MERGE:
+ if (opt_merge)
+ have_merge_db= SHOW_OPTION_YES;
+ else
+ have_merge_db= SHOW_OPTION_DISABLED;
#ifdef WITH_BERKELEY_STORAGE_ENGINE
case OPT_BDB_NOSYNC:
/* Deprecated option */
--- 1.25/mysql-test/t/warnings.test 2006-08-03 10:40:36 +02:00
+++ 1.26/mysql-test/t/warnings.test 2006-08-03 10:40:36 +02:00
@@ -116,6 +116,9 @@
#create table t1 (id int) engine=isam;
#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 table_type variable
--- 1.183/sql/set_var.cc 2006-08-03 10:40:36 +02:00
+++ 1.184/sql/set_var.cc 2006-08-03 10:40:36 +02:00
@@ -681,6 +681,7 @@
&have_federated_db);
sys_var_have_variable sys_have_geometry("have_geometry", &have_geometry);
sys_var_have_variable sys_have_innodb("have_innodb", &have_innodb);
+sys_var_have_variable sys_have_merge_db("have_merge", &have_merge_db);
sys_var_have_variable sys_have_ndbcluster("have_ndbcluster", &have_ndbcluster);
sys_var_have_variable sys_have_openssl("have_openssl", &have_openssl);
sys_var_have_variable sys_have_partition_db("have_partitioning",
@@ -821,6 +822,7 @@
{sys_have_federated_db.name,(char*) &have_federated_db, SHOW_HAVE},
{sys_have_geometry.name, (char*) &have_geometry, SHOW_HAVE},
{sys_have_innodb.name, (char*) &have_innodb, SHOW_HAVE},
+ {sys_have_merge_db.name, (char*) &have_merge_db, SHOW_HAVE},
{sys_have_ndbcluster.name, (char*) &have_ndbcluster, SHOW_HAVE},
{sys_have_openssl.name, (char*) &have_openssl, SHOW_HAVE},
{sys_have_partition_db.name,(char*) &have_partition_db, SHOW_HAVE},
--- 1.41/mysql-test/r/warnings.result 2006-08-03 10:40:36 +02:00
+++ 1.42/mysql-test/r/warnings.result 2006-08-03 10:40:36 +02:00
@@ -166,6 +166,20 @@
Variable_name Value
max_error_count 10
drop table t1;
+create table t1 (id int) engine=merge;
+Warnings:
+Warning 1266 Using storage engine MyISAM for table 't1'
+alter table t1 engine=merge;
+Warnings:
+Warning 1266 Using storage engine MyISAM for table 't1'
+drop table t1;
+create table t1 (id int) type=heap;
+Warnings:
+Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
+alter table t1 type=myisam;
+Warnings:
+Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
+drop table t1;
set table_type=MYISAM;
Warnings:
Warning 1541 The syntax 'table_type' is deprecated and will be removed in MySQL 5.2. Please use 'storage_engine' instead.
| Thread |
|---|
| • bk commit into 5.1 tree (tsmith:1.2260) | tim | 3 Aug |
