summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorgbichot@quadita2.mysql.com <>2005-04-23 00:05:05 +0200
committergbichot@quadita2.mysql.com <>2005-04-23 00:05:05 +0200
commitb75789e3d8e25f263a2bbcd1cc749790a40156b8 (patch)
treea0b071b9c448ae1d81282025e509cdddcfdee271 /sql/log.cc
parenta0c3aed75fea532845512034e67b8865fa65ae23 (diff)
downloadmariadb-git-b75789e3d8e25f263a2bbcd1cc749790a40156b8.tar.gz
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"
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc7
1 files changed, 7 insertions, 0 deletions
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 */