Commit d7baef2a authored by unknown's avatar unknown
Browse files

Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes needed

parents 8a08c802 e7ea49dc

mysql-test/r/warnings.result

+7 −0
Original line number Diff line number Diff line
@@ -173,6 +173,13 @@ alter table t1 engine=isam; 
Warnings:

Warning	1266	Using storage engine MyISAM for table 't1'

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

mysql-test/t/warnings-master.opt

+1 −1
Original line number Diff line number Diff line 
--skip-isam
 
--skip-isam --skip-merge

mysql-test/t/warnings.test

+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ 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 TYPE= syntax

#

sql/mysql_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -1324,6 +1324,7 @@ extern SHOW_COMP_OPTION have_ndbcluster; 
#endif



extern SHOW_COMP_OPTION have_isam;

extern SHOW_COMP_OPTION have_merge_db;

extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_dlopen;

extern SHOW_COMP_OPTION have_query_cache;

extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;

sql/mysqld.cc

+6 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static bool lower_case_table_names_used= 0; 
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 @@ enum options_mysqld 
  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 @@ master-ssl", 
#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,