List:Commits« Previous MessageNext Message »
From:Mats Kindahl Date:January 9 2006 2:59pm
Subject:bk commit into 5.1 tree (mats:1.2025)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl. When mkindahl 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.2025 06/01/09 15:59:39 mats@stripped +3 -0
  Changes to support aCC on HP-UX.

  sql/sql_class.h
    1.281 06/01/09 15:59:30 mats@stripped +2 -1
    Adding template parameter as argument to member template function to support aCC on HP-UX.

  sql/sql_class.cc
    1.232 06/01/09 15:59:30 mats@stripped +23 -16
    Adding template parameter as argument to member template function to support aCC on HP-UX.

  sql/log_event.h
    1.124 06/01/09 15:59:30 mats@stripped +4 -1
    Adding enumeration constants since aCC (HP-UX) does not like empty enumerations.

# 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:	mats
# Host:	dl145k.mysql.com
# Root:	/users/mkindahl/bk/fix-mysql-5.1-new

--- 1.123/sql/log_event.h	2005-12-22 05:10:55 +01:00
+++ 1.124/sql/log_event.h	2006-01-09 15:59:30 +01:00
@@ -1673,8 +1673,11 @@
   {
     /* 
        Nothing here right now, but the flags support is there in
-       preparation for changes that are coming.
+       preparation for changes that are coming.  Need to add a
+       constant to make it compile under HP-UX: aCC does not like
+       empty enumerations.
     */
+    ENUM_FLAG_COUNT
   };
 
   typedef uint16 flag_set;

--- 1.231/sql/sql_class.cc	2006-01-04 16:24:43 +01:00
+++ 1.232/sql/sql_class.cc	2006-01-09 15:59:30 +01:00
@@ -2173,7 +2173,8 @@
                                        MY_BITMAP const* cols,
                                        my_size_t colcnt,
                                        my_size_t needed,
-                                       bool is_transactional)
+                                       bool is_transactional,
+				       RowsEventT *hint __attribute__((unused)))
 {
   /* Pre-conditions */
   DBUG_ASSERT(table->s->table_map_id != ULONG_MAX);
@@ -2238,16 +2239,19 @@
   compiling option.
 */
 template Rows_log_event*
-THD::binlog_prepare_pending_rows_event<Write_rows_log_event>
-(TABLE*, uint32, MY_BITMAP const*, my_size_t colcnt, size_t, bool);
+THD::binlog_prepare_pending_rows_event(TABLE*, uint32, MY_BITMAP const*,
+				       my_size_t, my_size_t, bool,
+				       Write_rows_log_event*);
 
 template Rows_log_event*
-THD::binlog_prepare_pending_rows_event<Delete_rows_log_event>
-(TABLE*, uint32, MY_BITMAP const*, my_size_t colcnt, size_t, bool);
+THD::binlog_prepare_pending_rows_event(TABLE*, uint32, MY_BITMAP const*,
+				       my_size_t colcnt, my_size_t, bool,
+				       Delete_rows_log_event *);
 
 template Rows_log_event* 
-THD::binlog_prepare_pending_rows_event<Update_rows_log_event>
-(TABLE*, uint32, MY_BITMAP const*, my_size_t colcnt, size_t, bool);
+THD::binlog_prepare_pending_rows_event(TABLE*, uint32, MY_BITMAP const*,
+				       my_size_t colcnt, my_size_t, bool,
+				       Update_rows_log_event *);
 
 static char const* 
 field_type_name(enum_field_types type) 
@@ -2384,9 +2388,10 @@
   }
   my_size_t const len= pack_row(table, cols, row_data, record);
 
-  Rows_log_event* const
-    ev= binlog_prepare_pending_rows_event<Write_rows_log_event>
-    (table, server_id, cols, colcnt, len, is_trans);
+  Rows_log_event* const ev=
+    binlog_prepare_pending_rows_event(table, server_id, cols, colcnt,
+				      len, is_trans,
+				      static_cast<Write_rows_log_event*>(0));
 
   /* add_row_data copies row_data to internal buffer */
   error= likely(ev != 0) ? ev->add_row_data(row_data,len) : HA_ERR_OUT_OF_MEM ;
@@ -2429,9 +2434,10 @@
   my_size_t const after_size= pack_row(table, cols, after_row, 
                                        after_record);
   
-  Rows_log_event* const
-    ev= binlog_prepare_pending_rows_event<Update_rows_log_event>
-    (table, server_id, cols, colcnt, before_size + after_size, is_trans);
+  Rows_log_event* const ev=
+    binlog_prepare_pending_rows_event(table, server_id, cols, colcnt,
+				      before_size + after_size, is_trans,
+				      static_cast<Update_rows_log_event*>(0));
 
   error= (unlikely(!ev)) || ev->add_row_data(before_row, before_size) ||
     ev->add_row_data(after_row, after_size);
@@ -2462,9 +2468,10 @@
     return HA_ERR_OUT_OF_MEM;
   my_size_t const len= pack_row(table, cols, row_data, record);
 
-  Rows_log_event* const
-    ev= binlog_prepare_pending_rows_event<Delete_rows_log_event>
-    (table, server_id, cols, colcnt, len, is_trans);
+  Rows_log_event* const ev=
+    binlog_prepare_pending_rows_event(table, server_id, cols, colcnt,
+				      len, is_trans,
+				      static_cast<Delete_rows_log_event*>(0));
 
   error= (unlikely(!ev)) || ev->add_row_data(row_data, len);
 

--- 1.280/sql/sql_class.h	2005-12-22 05:10:55 +01:00
+++ 1.281/sql/sql_class.h	2006-01-09 15:59:30 +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 (mats:1.2025)Mats Kindahl9 Jan