Commit 1376b581 authored by unknown's avatar unknown
Browse files

Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)

parent 0fa250a9

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/handler.cc

+3 −1
Original line number Diff line number Diff line
@@ -302,7 +302,9 @@ handler *get_new_handler(TABLE *table, MEM_ROOT *alloc, enum db_type db_type) 
#endif

  case DB_TYPE_MRG_MYISAM:

  case DB_TYPE_MRG_ISAM:

    if (have_merge_db == SHOW_OPTION_YES)

      return new (alloc) ha_myisammrg(table);

    return NULL;

#ifdef HAVE_BERKELEY_DB

  case DB_TYPE_BERKELEY_DB:

    if (have_berkeley_db == SHOW_OPTION_YES)

sql/mysql_priv.h

+4 −0
Original line number Diff line number Diff line
@@ -1304,6 +1304,10 @@ extern handlerton ndbcluster_hton; 
extern SHOW_COMP_OPTION have_ndbcluster;

#endif



/* MRG_MYISAM handler is always built, but may be skipped */

extern handlerton myisammrg_hton;

#define have_merge_db myisammrg_hton.state



extern SHOW_COMP_OPTION have_isam;

extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_dlopen;

extern SHOW_COMP_OPTION have_query_cache;