MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:monty Date:June 6 2006 11:48am
Subject:bk commit into 5.1 tree (msvensson:1.2188) BUG#19544
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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.2188 06/06/06 14:48:15 msvensson@stripped +3 -0
  Re-apply missing changesets in 5.1
  
  BUG#19544 mysqldump does not backup TS and LG information correctly.
    
  Problem was the type of the column was varchar(8) not an integer type. So mysqld
  was outputting a string representation of the number in scientific notation,
  which wasn't exact. Now we do it as a bigint and output the number in bytes.
  
  Fix assertion when loading plugins due to handler changes
  

  sql/sql_show.cc
    1.347 06/06/06 14:48:09 msvensson@stripped +3 -3
    Correct type of I_S.FILES table columns: INITIAL_SIZE, MAXIMUM_SIZE and AUTOEXTEND_SIZE
    so that they really are bigint and not varchar. (By stewart)
    

  sql/sql_plugin.cc
    1.24 06/06/06 14:48:09 msvensson@stripped +1 -0
    Fix assertion when loading plugins due to handler changes (By jimw)

  sql/sql_base.cc
    1.329 06/06/06 14:48:09 msvensson@stripped +1 -1
    manual merge (comment by igor)

# 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:	msvensson
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1-ok

--- 1.328/sql/sql_base.cc	2006-06-05 06:16:03 +03:00
+++ 1.329/sql/sql_base.cc	2006-06-06 14:48:09 +03:00
@@ -5488,7 +5488,7 @@
         0)
     {
       my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(),
-	       table->s->table_name.str);
+               table->pos_in_table_list->alias);
       map->set_all();
       return 1;
     }

--- 1.346/sql/sql_show.cc	2006-06-06 02:47:26 +03:00
+++ 1.347/sql/sql_show.cc	2006-06-06 14:48:09 +03:00
@@ -5448,9 +5448,9 @@
   {"FREE_EXTENTS", 4, MYSQL_TYPE_LONG, 0, 0, 0},
   {"TOTAL_EXTENTS", 4, MYSQL_TYPE_LONG, 0, 0, 0},
   {"EXTENT_SIZE", 4, MYSQL_TYPE_LONG, 0, 0, 0},
-  {"INITIAL_SIZE", 8, MYSQL_TYPE_LONGLONG, 0, 0, 0},
-  {"MAXIMUM_SIZE", 8, MYSQL_TYPE_LONGLONG, 0, 0, 0},
-  {"AUTOEXTEND_SIZE", 8, MYSQL_TYPE_LONGLONG, 0, 0, 0},
+  {"INITIAL_SIZE", 21, MYSQL_TYPE_LONG, 0, 0, 0},
+  {"MAXIMUM_SIZE", 21, MYSQL_TYPE_LONG, 0, 0, 0},
+  {"AUTOEXTEND_SIZE", 21, MYSQL_TYPE_LONG, 0, 0, 0},
   {"CREATION_TIME", 0, MYSQL_TYPE_TIMESTAMP, 0, 0, 0},
   {"LAST_UPDATE_TIME", 0, MYSQL_TYPE_TIMESTAMP, 0, 0, 0},
   {"LAST_ACCESS_TIME", 0, MYSQL_TYPE_TIMESTAMP, 0, 0, 0},

--- 1.23/sql/sql_plugin.cc	2006-06-04 19:23:56 +03:00
+++ 1.24/sql/sql_plugin.cc	2006-06-06 14:48:09 +03:00
@@ -843,6 +843,7 @@
 
   tmp->state= PLUGIN_IS_READY;
 
+  table->use_all_columns();
   restore_record(table, s->default_values);
   table->field[0]->store(name->str, name->length, system_charset_info);
   table->field[1]->store(dl->str, dl->length, files_charset_info);
Thread
bk commit into 5.1 tree (msvensson:1.2188) BUG#19544monty6 Jun