Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

into  romeo.(none):/home/bkroot/mysql-5.1-rpl

sql/field.h

@@ -193,9 +193,9 @@ class Field
   */
   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 @@ class Field
       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; }

sql/log_event.cc

@@ -5906,12 +5906,7 @@ unpack_row(RELAY_LOG_INFO const *rli,
         /*
           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);