List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:January 17 2006 12:32pm
Subject:bk commit into 5.1 tree (joerg:1.2062)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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.2062 06/01/17 13:32:28 joerg@stripped +3 -0
  Manual merge of 5.1.5 build changes into the general tree.

  sql/sql_class.cc
    1.236 06/01/17 13:32:22 joerg@stripped +0 -5
    Manual merge (one of the changes was incomplete).

  sql/log_event.h
    1.126 06/01/17 12:43:33 joerg@stripped +0 -1
    Auto merged

  sql/log_event.cc
    1.198 06/01/17 12:43:32 joerg@stripped +0 -45
    Auto merged

# 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:	joerg
# Host:	trift2.
# Root:	/M51/mysql-5.1/RESYNC

--- 1.197/sql/log_event.cc	2006-01-15 15:41:18 +01:00
+++ 1.198/sql/log_event.cc	2006-01-17 12:43:32 +01:00
@@ -6171,7 +6171,7 @@
   */
   DBUG_ASSERT(table->s->fields >= m_width);
   DBUG_ASSERT(ptr);
-  ptr= unpack_row(table, table->record[0], ptr, &m_cols);
+  ptr= unpack_row(table, (char*)table->record[0], ptr, &m_cols);
   return ptr;
 }
 

--- 1.125/sql/log_event.h	2006-01-10 00:31:49 +01:00
+++ 1.126/sql/log_event.h	2006-01-17 12:43:33 +01:00
@@ -1784,7 +1784,7 @@
   /* Special constants representing sets of flags */
   enum 
   {
-      NO_FLAGS = 0U
+      RLE_NO_FLAGS = 0U
   };
 
   virtual ~Rows_log_event();
Thread
bk commit into 5.1 tree (joerg:1.2062)Joerg Bruehe17 Jan