MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Sergey Vojtovich Date:January 31 2007 2:32pm
Subject:bk commit into 5.0 tree (svoj:1.2389)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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@stripped, 2007-01-31 18:32:53+04:00, svoj@stripped +2 -0
  After merge fix (WL#3567).

  sql/ha_myisam.cc@stripped, 2007-01-31 18:32:51+04:00, svoj@stripped +2 -1
    After merge fix (WL#3567).

  sql/ha_myisammrg.cc@stripped, 2007-01-31 18:32:51+04:00, svoj@stripped +1 -1
    After merge fix (WL#3567).

# 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:	svoj
# Host:	june.mysql.com
# Root:	/home/svoj/devel/mysql/WL3567/mysql-5.0-engines

--- 1.173/sql/ha_myisam.cc	2007-01-31 17:09:57 +04:00
+++ 1.174/sql/ha_myisam.cc	2007-01-31 18:32:51 +04:00
@@ -1728,12 +1728,13 @@ int ha_myisam::create(const char *name, 
 		      HA_CREATE_INFO *info)
 {
   int error;
-  uint create_flags= 0, options= table_arg->db_options_in_use, records;
+  uint create_flags= 0, records;
   char buff[FN_REFLEN];
   MI_KEYDEF *keydef;
   MI_COLUMNDEF *recinfo;
   MI_CREATE_INFO create_info;
   TABLE_SHARE *share= table->s;
+  uint options= share->db_options_in_use;
   DBUG_ENTER("ha_myisam::create");
   if ((error= table2myisam(table_arg, &keydef, &recinfo, &records)))
     DBUG_RETURN(error); /* purecov: inspected */

--- 1.88/sql/ha_myisammrg.cc	2007-01-31 17:09:57 +04:00
+++ 1.89/sql/ha_myisammrg.cc	2007-01-31 18:32:51 +04:00
@@ -97,7 +97,7 @@ int ha_myisammrg::open(const char *name,
   MI_COLUMNDEF *recinfo;
   MYRG_TABLE *u_table;
   uint recs;
-  uint keys= table->keys;
+  uint keys= table->s->keys;
   int error;
   char name_buff[FN_REFLEN];
 
Thread
bk commit into 5.0 tree (svoj:1.2389)Sergey Vojtovich31 Jan