List:Commits« Previous MessageNext Message »
From:Patrick Galbraith Date:January 18 2006 4:26pm
Subject:bk commit into 5.1 tree (patg:1.2023)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of patg. When patg 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.2023 06/01/18 08:26:30 patg@stripped +2 -0
  WL# 2682
  
  Post merge fixes

  sql/share/errmsg.txt
    1.65 06/01/18 08:26:26 patg@stripped +0 -6
    WL #2682
    
    Post merge fixes

  sql/ha_partition.cc
    1.32 06/01/18 08:26:26 patg@stripped +1 -1
    WL# 2682 Post merge fixes

# 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:	patg
# Host:	govinda.patg.net
# Root:	/home/patg/mysql-build/mysql-5.1-wl2682

--- 1.64/sql/share/errmsg.txt	2006-01-17 16:53:33 -08:00
+++ 1.65/sql/share/errmsg.txt	2006-01-18 08:26:26 -08:00
@@ -5782,12 +5782,6 @@
         eng "The size number was correct but we don't allow the digit part to be more than 2 billion"
 ER_ALTER_TABLESPACE_FAILED
         eng "Failed to alter: %s"
-ER_BINLOG_ROW_LOGGING_FAILED
-	eng "Writing one row to the row-based binary log failed"
-ER_BINLOG_ROW_WRONG_TABLE_DEF
-	eng "Table definition on master and slave does not match"
-ER_BINLOG_ROW_RBR_TO_SBR
-	eng "Slave running with --log-slave-updates must use row-based binary logging to be able to replicate row-based binary log events"
 ER_EVENT_ALREADY_EXISTS
         eng "Event '%-.64s' already exists"
 ER_EVENT_STORE_FAILED

--- 1.31/sql/ha_partition.cc	2006-01-17 16:53:33 -08:00
+++ 1.32/sql/ha_partition.cc	2006-01-18 08:26:26 -08:00
@@ -2405,7 +2405,7 @@
   bitmap_copy(&(m_part_info->used_partitions_copy),
               &(m_part_info->used_partitions));
 
-  handler **file= m_file;
+  file= m_file;
   do
   {
     if (_bitmap_is_set(&(m_part_info->used_partitions_copy), (file - m_file)))
Thread
bk commit into 5.1 tree (patg:1.2023)Patrick Galbraith18 Jan