MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:guilhem Date:April 22 2005 10:05pm
Subject:bk commit into 5.0 tree (gbichot:1.1879) BUG#9542
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of gbichot. When gbichot does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1879 05/04/23 00:05:05 gbichot@stripped +6 -0
  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"
  

  sql/set_var.cc
    1.106 05/04/23 00:05:00 gbichot@stripped +0 -1
    --log-update is deprecated and replaced by --log-bin so don't show log_update in SHOW VARIABLES.

  sql/log.cc
    1.160 05/04/23 00:05:00 gbichot@stripped +7 -0
    TC_LOG::open(): don't try to open if the index (relevant only for binlog TC log)
    could not be opened.

  sql/handler.cc
    1.162 05/04/23 00:05:00 gbichot@stripped +2 -2
    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.

  mysql-test/r/variables.result
    1.61 05/04/23 00:05:00 gbichot@stripped +2 -2
    MEMORY, not HEAP

  mysql-test/r/ps_1general.result
    1.39 05/04/23 00:05:00 gbichot@stripped +1 -1
    order changed in SHOW STORAGE ENGINES

  mysql-test/r/create.result
    1.85 05/04/23 00:04:59 gbichot@stripped +4 -4
    MEMORY, not HEAP

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gbichot
# Host:	quadita2.mysql.com
# Root:	/nfstmp1/guilhem/mysql-5.0-4ita

--- 1.161/sql/handler.cc	2005-04-16 03:35:46 +02:00
+++ 1.162/sql/handler.cc	2005-04-23 00:05:00 +02:00
@@ -70,10 +70,10 @@
 {
   {"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,

--- 1.159/sql/log.cc	2005-04-05 13:17:39 +02:00
+++ 1.160/sql/log.cc	2005-04-23 00:05:00 +02:00
@@ -2857,6 +2857,13 @@
   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 */

--- 1.38/mysql-test/r/ps_1general.result	2005-04-04 21:43:54 +02:00
+++ 1.39/mysql-test/r/ps_1general.result	2005-04-23 00:05:00 +02:00
@@ -322,8 +322,8 @@
 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

--- 1.84/mysql-test/r/create.result	2005-04-06 04:45:07 +02:00
+++ 1.85/mysql-test/r/create.result	2005-04-23 00:04:59 +02:00
@@ -210,7 +210,7 @@
 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 @@
 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 @@
 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 @@
 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

--- 1.60/mysql-test/r/variables.result	2005-04-02 05:02:07 +02:00
+++ 1.61/mysql-test/r/variables.result	2005-04-23 00:05:00 +02:00
@@ -148,7 +148,7 @@
 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 @@
 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;

--- 1.105/sql/set_var.cc	2005-04-16 03:23:45 +02:00
+++ 1.106/sql/set_var.cc	2005-04-23 00:05:00 +02:00
@@ -847,7 +847,6 @@
   {"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},
Thread
bk commit into 5.0 tree (gbichot:1.1879) BUG#9542guilhem23 Apr