bk commit into 5.1 tree (mats:1.2334)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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@stripped, 2006-11-03 21:11:58+01:00, mats@romeo.(none) +4 -0
  Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
  into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
  MERGE: 1.2307.2.2

  sql/log_event.cc@stripped, 2006-11-03 20:56:16+01:00, mats@romeo.(none) +0 -0
    Auto merged
    MERGE: 1.246.1.1

  sql/rpl_rli.h@stripped, 2006-11-03 20:56:16+01:00, mats@romeo.(none) +0 -0
    Auto merged
    MERGE: 1.4.1.1

  sql/slave.cc@stripped, 2006-11-03 21:11:30+01:00, mats@romeo.(none) +0 -3
    MERGE: 1.288.1.1

  sql/sql_class.cc@stripped, 2006-11-03 20:56:17+01:00, mats@romeo.(none) +0 -0
    Auto merged
    MERGE: 1.293.1.1

# 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:	romeo.(none)
# Root:	/home/bk/b18581-mysql-5.1-new-rpl/RESYNC

--- 1.247/sql/log_event.cc	2006-11-03 21:12:07 +01:00
+++ 1.248/sql/log_event.cc	2006-11-03 21:12:07 +01:00
@@ -7128,8 +7128,8 @@
                     row_start, &m_cols, row_end, &m_master_reclength,
                     table->write_set, UPDATE_ROWS_EVENT);
 
-  DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
-  DBUG_DUMP("m_after_image", m_after_image, table->s->reclength);
+  DBUG_DUMP("record[0]", (char *)table->record[0], table->s->reclength);
+  DBUG_DUMP("m_after_image", (char *)m_after_image, table->s->reclength);
 
 
   /*

--- 1.294/sql/sql_class.cc	2006-11-03 21:12:07 +01:00
+++ 1.295/sql/sql_class.cc	2006-11-03 21:12:07 +01:00
@@ -2632,10 +2632,10 @@
   my_size_t const after_size= pack_row(table, cols, after_row, 
                                        after_record);
   
-  DBUG_DUMP("before_record", before_record, table->s->reclength);
-  DBUG_DUMP("after_record", after_record, table->s->reclength);
-  DBUG_DUMP("before_row", before_row, before_size);
-  DBUG_DUMP("after_row", after_row, after_size);
+  DBUG_DUMP("before_record", (char *)before_record, table->s->reclength);
+  DBUG_DUMP("after_record", (char *)after_record, table->s->reclength);
+  DBUG_DUMP("before_row", (char *)before_row, before_size);
+  DBUG_DUMP("after_row", (char *)after_row, after_size);
 
   Rows_log_event* const ev=
     binlog_prepare_pending_rows_event(table, server_id, cols, colcnt,

--- 1.6/sql/rpl_rli.h	2006-11-03 21:12:07 +01:00
+++ 1.7/sql/rpl_rli.h	2006-11-03 21:12:07 +01:00
@@ -293,22 +293,6 @@
   void cached_charset_invalidate();
   bool cached_charset_compare(char *charset);
 
-  /*
-    To reload special tables when they are changes, we introduce a set
-    of functions that will mark whenever special functions need to be
-    called after modifying tables.  Right now, the tables are either
-    ACL tables or grants tables.
-  */
-  enum enum_reload_flag
-  {
-    RELOAD_NONE_F   = 0UL,
-    RELOAD_GRANT_F  = (1UL << 0), 
-    RELOAD_ACCESS_F = (1UL << 1)
-  };
-
-  ulong m_reload_flags;
-
-  void touching_table(char const* db, char const* table, ulong table_id);
   void transaction_end(THD*);
 
   void cleanup_context(THD *, bool);