Commit 9a7ad1bf authored by unknown's avatar unknown
Browse files

bug (colcnt) + compile fix 


mysql-test/t/disabled.def:
  disabled hanging test
parent 12443de1

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ rpl_deadlock_innodb : BUG#16920 2006-04-12 kent fails in show slave stat 
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

sql/log_event.cc

+3 −2
Original line number Diff line number Diff line
@@ -5294,12 +5294,11 @@ unpack_row(RELAY_LOG_INFO *rli, 


      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 @@ void Table_map_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info) 
}

#endif



#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)

#ifndef DBUG_OFF

static void

print_column_values(char const *text, THD *thd, TABLE *table)
@@ -6094,6 +6094,7 @@ print_column_values(char const *text, THD *thd, TABLE *table) 
  table->in_use= old_thd;

}

#endif

#endif



/**************************************************************************

	Write_rows_log_event member functions