bk commit into 5.1 tree (mats:1.2486)

[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, 2007-03-28 15:30:03+02:00, mats@romeo.(none) +2 -0
  Eliminating some warnings.

  sql/field.h@stripped, 2007-03-28 15:29:57+02:00, mats@romeo.(none) +4 -4
    Using my_ptrdiff_t for offset instead of uint.

  sql/log_event.cc@stripped, 2007-03-28 15:29:57+02:00, mats@romeo.(none) +0 -5
    Removing debug code that generated warnings on Windows build.

# 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/b22583-mysql-5.1-new-rpl

--- 1.213/sql/field.h	2007-03-28 15:30:13 +02:00
+++ 1.214/sql/field.h	2007-03-28 15:30:13 +02:00
@@ -193,9 +193,9 @@
   */
   virtual void sql_type(String &str) const =0;
   virtual uint size_of() const =0;		// For new field
-  inline bool is_null(uint row_offset=0)
+  inline bool is_null(my_ptrdiff_t row_offset= 0)
   { return null_ptr ? (null_ptr[row_offset] & null_bit ? 1 : 0) : table->null_row; }
-  inline bool is_real_null(uint row_offset=0)
+  inline bool is_real_null(my_ptrdiff_t row_offset= 0)
     { return null_ptr ? (null_ptr[row_offset] & null_bit ? 1 : 0) : 0; }
   inline bool is_null_in_record(const uchar *record)
   {
@@ -210,9 +210,9 @@
       return 0;
     return test(null_ptr[offset] & null_bit);
   }
-  inline void set_null(int row_offset=0)
+  inline void set_null(my_ptrdiff_t row_offset= 0)
     { if (null_ptr) null_ptr[row_offset]|= null_bit; }
-  inline void set_notnull(int row_offset=0)
+  inline void set_notnull(my_ptrdiff_t row_offset= 0)
     { if (null_ptr) null_ptr[row_offset]&= (uchar) ~null_bit; }
   inline bool maybe_null(void) { return null_ptr != 0 || table->maybe_null; }
   inline bool real_maybe_null(void) { return null_ptr != 0; }

--- 1.280/sql/log_event.cc	2007-03-28 15:30:13 +02:00
+++ 1.281/sql/log_event.cc	2007-03-28 15:30:13 +02:00
@@ -5906,12 +5906,7 @@
         /*
           We only unpack the field if it was non-null
         */
-#ifndef DBUG_OFF
-        const char *const old_ptr= pack_ptr;
-#endif
         pack_ptr= f->unpack(f->ptr, pack_ptr);
-        DBUG_PRINT("debug", ("Unpacking field '%s' from %d bytes",
-                             f->field_name, pack_ptr - old_ptr));
       }
 
       bitmap_set_bit(rw_set, f->field_index);