List:Commits« Previous MessageNext Message »
From:tomas Date:January 9 2006 8:33pm
Subject:bk commit into 5.1 tree (tomas:1.2031)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2031 06/01/09 21:33:36 tomas@stripped +2 -0
  Merge tulin@stripped:/home/bk/mysql-5.1-new
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-wl2325-v6

  sql/sql_class.h
    1.282 06/01/09 21:33:28 tomas@stripped +0 -0
    Auto merged

  sql/log.cc
    1.183 06/01/09 21:33:28 tomas@stripped +0 -0
    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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-v6/RESYNC

--- 1.182/sql/log.cc	2006-01-05 12:55:42 +01:00
+++ 1.183/sql/log.cc	2006-01-09 21:33:28 +01:00
@@ -2567,7 +2567,7 @@
 #endif
 
   Table_map_log_event::flag_set const
-    flags= Table_map_log_event::NO_FLAGS;
+    flags= Table_map_log_event::TM_NO_FLAGS;
 
   Table_map_log_event
     the_event(thd, table, table->s->table_map_id, is_transactional, flags);

--- 1.281/sql/sql_class.h	2006-01-05 12:01:58 +01:00
+++ 1.282/sql/sql_class.h	2006-01-09 21:33:28 +01:00
@@ -922,7 +922,8 @@
                                       MY_BITMAP const* cols,
                                       my_size_t colcnt,
                                       my_size_t needed,
-                                      bool is_transactional);
+                                      bool is_transactional,
+				      RowsEventT* hint);
   Rows_log_event* binlog_get_pending_rows_event() const;
   void            binlog_set_pending_rows_event(Rows_log_event* ev);
   int             binlog_setup_trx_data();
Thread
bk commit into 5.1 tree (tomas:1.2031)tomas9 Jan