bk commit into 5.1 tree (tomas:1.2359)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2359 06/05/04 11:15:14 tomas@stripped +2 -0
  bug (colcnt) + compile fix

  sql/log_event.cc
    1.221 06/05/04 11:15:07 tomas@stripped +3 -2
    bug (colcnt) + compile fix

  mysql-test/t/disabled.def
    1.134 06/05/04 11:15:07 tomas@stripped +1 -0
    disabled hanging test

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl3228

--- 1.220/sql/log_event.cc	2006-05-03 15:00:28 +02:00
+++ 1.221/sql/log_event.cc	2006-05-04 11:15:07 +02:00
@@ -5294,12 +5294,11 @@
 
       if (colcnt == 0)
         break;
-
+      --colcnt;
       if (bitmap_is_set(cols, field_ptr -  begin_ptr))
       {
         /* Field...::unpack() cannot return 0 */
         ptr= f->unpack(f->ptr + offset, ptr);
-        --colcnt;
       }
       else
         bitmap_clear_bit(write_set, (field_ptr - begin_ptr) + 1);
@@ -6076,6 +6075,7 @@
 }
 #endif
 
+#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
 #ifndef DBUG_OFF
 static void
 print_column_values(char const *text, THD *thd, TABLE *table)
@@ -6093,6 +6093,7 @@
   }
   table->in_use= old_thd;
 }
+#endif
 #endif
 
 /**************************************************************************

--- 1.133/mysql-test/t/disabled.def	2006-04-13 22:25:54 +02:00
+++ 1.134/mysql-test/t/disabled.def	2006-05-04 11:15:07 +02:00
@@ -24,6 +24,7 @@
 rpl_ndb_2innodb          : BUG#19004 2006-03-22 tomas ndb: partition by range and update
hangs
 rpl_ndb_2myisam          : BUG#19004 2006-03-22 tomas ndb: partition by range and update
hangs
 rpl_ndb_auto_inc         : BUG#17086 2006-02-16 jmiller CR: auto_increment_increment and
auto_increment_offset produce duplicate key er
+rpl_ndb_commit_afterflush : LOCK TABLES cases hang in ndb injector thread
 rpl_ndb_ddl              : result file needs update + test needs to checked
 rpl_ndb_innodb2ndb       : BUG#18094 2006-03-16 mats Slave caches invalid table
definition after atlters causes select failure
 rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create
table and insert (on different table) not determ