Commit 3431b8cf authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1 

into  mysql.com:/data0/mysqldev/my/mysql-5.1-release


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_000015.result:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
parents e54bbaa3 a2e516d9

server-tools/instance-manager/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ client_settings.h: 


libexec_PROGRAMS= mysqlmanager



mysqlmanager_CXXFLAGS=  -Wall -W

mysqlmanager_CXXFLAGS=  



mysqlmanager_SOURCES=	command.cc command.h mysqlmanager.cc \

			manager.h manager.cc log.h log.cc \

sql/log_event.cc

+6 −6
Original line number Diff line number Diff line
@@ -5558,8 +5558,8 @@ unpack_row(RELAY_LOG_INFO *rli, 


    if (bitmap_is_set(cols, field_ptr -  begin_ptr))

    {

      DBUG_ASSERT(table->record[0] <= f->ptr);

      DBUG_ASSERT(f->ptr < (table->record[0] + table->s->reclength +

      DBUG_ASSERT((const char *)table->record[0] <= f->ptr);

      DBUG_ASSERT(f->ptr < ((const char *)table->record[0] + table->s->reclength +

                            (f->pack_length_in_rec() == 0)));



      DBUG_PRINT("info", ("unpacking column '%s' to 0x%lx", f->field_name,
@@ -6843,8 +6843,8 @@ static int find_and_fetch_row(TABLE *table, byte *key) 
    trigger false warnings.

   */

#ifndef HAVE_purify

    DBUG_DUMP("table->record[0]", table->record[0], table->s->reclength);

    DBUG_DUMP("table->record[1]", table->record[1], table->s->reclength);

    DBUG_DUMP("table->record[0]", (const char *)table->record[0], table->s->reclength);

    DBUG_DUMP("table->record[1]", (const char *)table->record[1], table->s->reclength);

#endif



    /*
@@ -6870,8 +6870,8 @@ static int find_and_fetch_row(TABLE *table, byte *key) 
    trigger false warnings.

   */

#ifndef HAVE_purify

    DBUG_DUMP("table->record[0]", table->record[0], table->s->reclength);

    DBUG_DUMP("table->record[1]", table->record[1], table->s->reclength);

    DBUG_DUMP("table->record[0]", (const char *)table->record[0], table->s->reclength);

    DBUG_DUMP("table->record[1]", (const char *)table->record[1], table->s->reclength);

#endif

    /*

      Below is a minor "optimization".  If the key (i.e., key number