summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/r/create.result8
-rw-r--r--mysql-test/r/ps_1general.result2
-rw-r--r--mysql-test/r/variables.result4
-rw-r--r--sql/handler.cc4
-rw-r--r--sql/log.cc7
-rw-r--r--sql/set_var.cc1
6 files changed, 16 insertions, 10 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index cafe6f23ccf..4f4400b4a9b 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -210,7 +210,7 @@ drop table if exists t1;
SET SESSION storage_engine="heap";
SELECT @@storage_engine;
@@storage_engine
-HEAP
+MEMORY
CREATE TABLE t1 (a int not null);
show create table t1;
Table Create Table
@@ -222,7 +222,7 @@ SET SESSION storage_engine="gemini";
ERROR 42000: Unknown table engine 'gemini'
SELECT @@storage_engine;
@@storage_engine
-HEAP
+MEMORY
CREATE TABLE t1 (a int not null);
show create table t1;
Table Create Table
@@ -371,7 +371,7 @@ drop database mysqltest;
SET SESSION storage_engine="heap";
SELECT @@storage_engine;
@@storage_engine
-HEAP
+MEMORY
CREATE TABLE t1 (a int not null);
show create table t1;
Table Create Table
@@ -383,7 +383,7 @@ SET SESSION storage_engine="gemini";
ERROR 42000: Unknown table engine 'gemini'
SELECT @@storage_engine;
@@storage_engine
-HEAP
+MEMORY
CREATE TABLE t1 (a int not null);
show create table t1;
Table Create Table
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index 0fe907ac8c1..6c616a99fb0 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -322,8 +322,8 @@ prepare stmt4 from ' show storage engines ';
execute stmt4;
Engine Support Comment
MyISAM YES/NO Default engine as of MySQL 3.23 with great performance
-HEAP YES/NO Alias for MEMORY
MEMORY YES/NO Hash based, stored in memory, useful for temporary tables
+HEAP YES/NO Alias for MEMORY
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
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 0f4f25dfdb5..b3850bcc72c 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -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;
diff --git a/sql/handler.cc b/sql/handler.cc
index 14b8974ece9..542efaba2bf 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -70,10 +70,10 @@ struct show_table_type_st sys_table_types[]=
{
{"MyISAM", &have_yes,
"Default engine as of MySQL 3.23 with great performance", DB_TYPE_MYISAM},
- {"HEAP", &have_yes,
- "Alias for MEMORY", DB_TYPE_HEAP},
{"MEMORY", &have_yes,
"Hash based, stored in memory, useful for temporary tables", DB_TYPE_HEAP},
+ {"HEAP", &have_yes,
+ "Alias for MEMORY", DB_TYPE_HEAP},
{"MERGE", &have_yes,
"Collection of identical MyISAM tables", DB_TYPE_MRG_MYISAM},
{"MRG_MYISAM",&have_yes,
diff --git a/sql/log.cc b/sql/log.cc
index 1d6bb4cdf41..fc74223d7b6 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2857,6 +2857,13 @@ int TC_LOG_BINLOG::open(const char *opt_name)
pthread_mutex_init(&LOCK_prep_xids, MY_MUTEX_INIT_FAST);
pthread_cond_init (&COND_prep_xids, 0);
+ if (!my_b_inited(&index_file))
+ {
+ /* There was a failure to open the index file, can't open the binlog */
+ cleanup();
+ return 1;
+ }
+
if (using_heuristic_recover())
{
/* generate a new binlog to mask a corrupted one */
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 70d64b5dac6..bb3db177936 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -847,7 +847,6 @@ struct show_var_st init_vars[]= {
{"log_slave_updates", (char*) &opt_log_slave_updates, SHOW_MY_BOOL},
#endif
{"log_slow_queries", (char*) &opt_slow_log, SHOW_BOOL},
- {"log_update", (char*) &opt_update_log, SHOW_BOOL},
{sys_log_warnings.name, (char*) &sys_log_warnings, SHOW_SYS},
{sys_long_query_time.name, (char*) &sys_long_query_time, SHOW_SYS},
{sys_low_priority_updates.name, (char*) &sys_low_priority_updates, SHOW_SYS},