Commit 91fbe52b authored by unknown's avatar unknown

Cleanups for storage engine patch. Changed two test results to now reflect the...

Cleanups for storage engine patch. Changed two test results to now reflect the changes in storage engines and a couple of comment changes in the code. 


mysql-test/r/ps_1general.result:
  Redoing test output with straightened up output for storage engine names.
mysql-test/r/variables.result:
  Fixed test case.
sql/handler.cc:
  Couple of format cleanups and a change in a comment.
parent 7a1cc524
...@@ -323,17 +323,12 @@ execute stmt4; ...@@ -323,17 +323,12 @@ execute stmt4;
Engine Support Comment Engine Support Comment
MyISAM YES/NO Default engine as of MySQL 3.23 with great performance MyISAM YES/NO Default engine as of MySQL 3.23 with great performance
MEMORY YES/NO Hash based, stored in memory, useful for temporary tables MEMORY YES/NO Hash based, stored in memory, useful for temporary tables
HEAP YES/NO Alias for MEMORY MRG_MYISAM YES/NO Collection of identical MyISAM tables
MERGE YES/NO Collection of identical MyISAM tables
MRG_MYISAM YES/NO Alias for MERGE
ISAM YES/NO Obsolete storage engine, now replaced by MyISAM ISAM YES/NO Obsolete storage engine, now replaced by MyISAM
MRG_ISAM YES/NO Obsolete storage engine, now replaced by MERGE MRG_ISAM YES/NO Obsolete storage engine, now replaced by MERGE
InnoDB YES/NO Supports transactions, row-level locking, and foreign keys InnoDB YES/NO Supports transactions, row-level locking, and foreign keys
INNOBASE YES/NO Alias for INNODB BERKELEYDB YES/NO Supports transactions and page-level locking
BDB YES/NO Supports transactions and page-level locking
BERKELEYDB YES/NO Alias for BDB
NDBCLUSTER YES/NO Clustered, fault-tolerant, memory-based tables NDBCLUSTER YES/NO Clustered, fault-tolerant, memory-based tables
NDB YES/NO Alias for NDBCLUSTER
EXAMPLE YES/NO Example storage engine EXAMPLE YES/NO Example storage engine
ARCHIVE YES/NO Archive storage engine ARCHIVE YES/NO Archive storage engine
CSV YES/NO CSV storage engine CSV YES/NO CSV storage engine
......
...@@ -147,7 +147,7 @@ Variable_name Value ...@@ -147,7 +147,7 @@ Variable_name Value
storage_engine MEMORY storage_engine MEMORY
show global variables like 'storage_engine'; show global variables like 'storage_engine';
Variable_name Value Variable_name Value
storage_engine MERGE storage_engine MRG_MYISAM
set GLOBAL query_cache_size=100000; set GLOBAL query_cache_size=100000;
set GLOBAL myisam_max_sort_file_size=2000000; set GLOBAL myisam_max_sort_file_size=2000000;
show global variables like 'myisam_max_sort_file_size'; show global variables like 'myisam_max_sort_file_size';
......
...@@ -80,8 +80,7 @@ ulong total_ha_2pc; ...@@ -80,8 +80,7 @@ ulong total_ha_2pc;
ulong savepoint_alloc_size; ulong savepoint_alloc_size;
/* /*
This structure will go away with loadable storeage engines, we will instead This structure will go away in the future.
build it dynamically from the configure script.
*/ */
struct show_table_type_st sys_table_types[]= struct show_table_type_st sys_table_types[]=
{ {
...@@ -406,7 +405,8 @@ int ha_init() ...@@ -406,7 +405,8 @@ int ha_init()
types->ht= &heap_hton; types->ht= &heap_hton;
for (table_alias= sys_table_aliases; table_alias->type; table_alias++) for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
{ {
if (!my_strcasecmp(&my_charset_latin1, types->ht->name, table_alias->type)) if (!my_strcasecmp(&my_charset_latin1, types->ht->name,
table_alias->type))
table_alias->st= types; table_alias->st= types;
} }
break; break;
...@@ -417,7 +417,8 @@ int ha_init() ...@@ -417,7 +417,8 @@ int ha_init()
types->ht= &myisammrg_hton; types->ht= &myisammrg_hton;
for (table_alias= sys_table_aliases; table_alias->type; table_alias++) for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
{ {
if (!my_strcasecmp(&my_charset_latin1, types->ht->name, table_alias->type)) if (!my_strcasecmp(&my_charset_latin1, types->ht->name,
table_alias->type))
table_alias->st= types; table_alias->st= types;
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment