Fix deprecation warning - database_engine => storage_engine

BitKeeper/etc/logging_ok

@@ -5,6 +5,7 @@ Administrator@fred.
 Miguel@light.local
 Sinisa@sinisa.nasamreza.org
 WAX@sergbook.mysql.com
+acurtis@pcgem.rdg.cyberkinetica.com
 administrador@light.hegel.local
 ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
 akishkin@work.mysql.com

mysql-test/r/derived.result

@@ -256,7 +256,7 @@ KEY t1_SortIndex (SORTORDER),
 KEY t1_IdIndex (OBJECTID)
 ) TYPE=MyISAM DEFAULT CHARSET=latin1;
 Warnings:
-Warning	1286	'TYPE=database_engine' is deprecated. Use 'ENGINE=database_engine' instead.
+Warning	1286	'TYPE=storage_engine' is deprecated. Use 'ENGINE=storage_engine' instead.
 CREATE TABLE t2 (
 ID int(11) default NULL,
 PARID int(11) default NULL,

mysql-test/r/symlink.result

@@ -66,7 +66,7 @@ t9	CREATE TABLE `t9` (
 drop database mysqltest;
 create table t1 (a int not null) type=myisam;
 Warnings:
-Warning	1286	'TYPE=database_engine' is deprecated. Use 'ENGINE=database_engine' instead.
+Warning	1286	'TYPE=storage_engine' is deprecated. Use 'ENGINE=storage_engine' instead.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/r/warnings.result

@@ -128,10 +128,10 @@ Warning	1265	Using storage engine MyISAM for table 't1'
 drop table t1;
 create table t1 (id int) type=heap;
 Warnings:
-Warning	1286	'TYPE=database_engine' is deprecated. Use 'ENGINE=database_engine' instead.
+Warning	1286	'TYPE=storage_engine' is deprecated. Use 'ENGINE=storage_engine' instead.
 alter table t1 type=myisam;
 Warnings:
-Warning	1286	'TYPE=database_engine' is deprecated. Use 'ENGINE=database_engine' instead.
+Warning	1286	'TYPE=storage_engine' is deprecated. Use 'ENGINE=storage_engine' instead.
 drop table t1;
 set table_type=MYISAM;
 Warnings:

sql/sql_yacc.yy

@@ -1077,7 +1077,7 @@ create_table_options:
 
 create_table_option:
 	ENGINE_SYM opt_equal storage_engines    { Lex->create_info.db_type= $3; }
-	| TYPE_SYM opt_equal storage_engines    { Lex->create_info.db_type= $3; WARN_DEPRECATED("TYPE=database_engine","ENGINE=database_engine"); }
+	| TYPE_SYM opt_equal storage_engines    { Lex->create_info.db_type= $3; WARN_DEPRECATED("TYPE=storage_engine","ENGINE=storage_engine"); }
 	| MAX_ROWS opt_equal ulonglong_num	{ Lex->create_info.max_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;}
 	| MIN_ROWS opt_equal ulonglong_num	{ Lex->create_info.min_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;}
 	| AVG_ROW_LENGTH opt_equal ULONG_NUM	{ Lex->create_info.avg_row_length=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;}