mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Fixes for BUG#10039 "MEMORY engine is reported as HEAP",
BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0", BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs" mysql-test/r/create.result: MEMORY, not HEAP mysql-test/r/ps_1general.result: order changed in SHOW STORAGE ENGINES mysql-test/r/variables.result: MEMORY, not HEAP sql/handler.cc: the array of storage engine names is searched in index order, so we must put the preferred name before the alias so that the preferred name is printed by MySQL instead of the alias. sql/log.cc: TC_LOG::open(): don't try to open if the index (relevant only for binlog TC log) could not be opened. sql/set_var.cc: --log-update is deprecated and replaced by --log-bin so don't show log_update in SHOW VARIABLES.
This commit is contained in:
@@ -148,7 +148,7 @@ timed_mutexes OFF
|
||||
set storage_engine=MYISAM, storage_engine="HEAP", global storage_engine="MERGE";
|
||||
show local variables like 'storage_engine';
|
||||
Variable_name Value
|
||||
storage_engine HEAP
|
||||
storage_engine MEMORY
|
||||
show global variables like 'storage_engine';
|
||||
Variable_name Value
|
||||
storage_engine MERGE
|
||||
@@ -254,7 +254,7 @@ set storage_engine=MERGE, big_tables=2;
|
||||
ERROR 42000: Variable 'big_tables' can't be set to the value of '2'
|
||||
show local variables like 'storage_engine';
|
||||
Variable_name Value
|
||||
storage_engine HEAP
|
||||
storage_engine MEMORY
|
||||
set SESSION query_cache_size=10000;
|
||||
ERROR HY000: Variable 'query_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
|
||||
set GLOBAL storage_engine=DEFAULT;
|
||||
|
Reference in New Issue
Block a user