bk commit into 5.1 tree (mats:1.2577)

[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-10-17 09:29:11+02:00, mats@stripped +1 -0
  Removing debug variables from non-debug builds.

  sql/rpl_record.cc@stripped, 2007-10-17 09:29:06+02:00, mats@stripped +4
-0
    Turning of declaration of debug variables in non-debug builds.

diff -Nrup a/sql/rpl_record.cc b/sql/rpl_record.cc
--- a/sql/rpl_record.cc	2007-10-17 06:49:55 +02:00
+++ b/sql/rpl_record.cc	2007-10-17 09:29:06 +02:00
@@ -99,7 +99,9 @@ pack_row(TABLE *table, MY_BITMAP const* 
           length is stored in little-endian format, since this is the
           format used for the binlog.
         */
+#ifndef DBUG_OFF
         const uchar *old_pack_ptr= pack_ptr;
+#endif
         pack_ptr= field->pack(pack_ptr, field->ptr + offset,
                               field->max_data_length(), TRUE);
         DBUG_PRINT("debug", ("field: %s; pack_ptr: 0x%lx;"
@@ -234,7 +236,9 @@ unpack_row(Relay_log_info const *rli,
           normal unpack operation.
         */
         uint16 const metadata= tabledef->field_metadata(i);
+#ifndef DBUG_OFF
         uchar const *const old_pack_ptr= pack_ptr;
+#endif
         pack_ptr= f->unpack(f->ptr, pack_ptr, metadata, TRUE);
 	DBUG_PRINT("debug", ("field: %s; metadata: 0x%x;"
                              " pack_ptr: 0x%lx; pack_ptr': 0x%lx; bytes: %d",