bk commit into 5.0 tree (guilhem:1.1902) BUG#12381

[guilhem]

Below is the list of changes that have just been committed into a local
5.0 repository of guilhem. When guilhem 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.1902 05/08/05 14:44:19 guilhem@stripped +2 -0
  removing unneeded includes. Next commit should be to fix BUG#12381 if it goes well.

  sql/rpl_tblmap.h
    1.2 05/08/05 14:44:11 guilhem@stripped +5 -7
    unneeded includes; comments.

  sql/rpl_tblmap.cc
    1.3 05/08/05 14:44:11 guilhem@stripped +0 -2
    unneeded include

# 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:	guilhem
# Host:	gbichot2.local
# Root:	/home/mysql_src/mysql-5.0-wl1012

--- 1.2/sql/rpl_tblmap.cc	2005-08-02 22:06:24 +02:00
+++ 1.3/sql/rpl_tblmap.cc	2005-08-05 14:44:11 +02:00
@@ -19,7 +19,6 @@
 #ifdef HAVE_REPLICATION
 
 #include "rpl_tblmap.h"
-#include <my_pthread.h>
 
 #define MAYBE_TABLE_NAME(T) ((T) ? (T)->s->table_name : "<>")
 #define TABLE_ID_HASH_SIZE 32
@@ -132,4 +131,3 @@
 }
 
 #endif
-

--- 1.1/sql/rpl_tblmap.h	2005-07-25 12:48:12 +02:00
+++ 1.2/sql/rpl_tblmap.h	2005-08-05 14:44:11 +02:00
@@ -17,10 +17,7 @@
 #ifndef TABLE_MAPPING_H
 #define TABLE_MAPPING_H
 
-#include <mysql.h>
-#include <my_pthread.h>
-
-// Forward declarations
+/* Forward declarations */
 struct st_table;
 typedef st_table TABLE;
 
@@ -57,7 +54,10 @@
   ulong     count() const { return m_table_ids.records; }
 
 private:
-  // This is a POD (Plain Old Data).  Keep it that way.
+  /*
+    This is a POD (Plain Old Data).  Keep it that way (we apply offsetof() to
+    it! which only works for PODs)
+  */
   struct entry { 
     ulong table_id;
     union {
@@ -81,5 +81,3 @@
 };
 
 #endif
-
-