Commit 8777e35a authored by unknown's avatar unknown
Browse files

Merge dl145h.mysql.com:/users/gbichot/mysql-5.0-rpl 

into  dl145h.mysql.com:/users/gbichot/mysql-5.1-rpl


sql/slave.cc:
  Auto merged
mysql-test/t/disabled.def:
  merge
parents f6034619 8c07265c

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -38,5 +38,5 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb 


flush2                   : Bug#24805 Pushbuild can't handle test with --disable-log-bin

mysql_upgrade            : Bug#25074 mysql_upgrade gives inconsisten results

rpl_insert_id            : Guilhem will enable as soon as replication team tree has merged with main tree and so got version number 5.1.16

rpl_insert_id   : replication team will enable as soon as they merge their tree with main tree and so got version number 5.1.17

sql/slave.cc

+2 −2
Original line number Diff line number Diff line
@@ -3667,8 +3667,8 @@ bool rpl_master_has_bug(RELAY_LOG_INFO *rli, uint bug_id) 
  };

  static struct st_version_range_for_one_bug versions_for_all_bugs[]=

  {

    {24432, { 5, 0, 24 }, { 5, 0, 36 } },

    {24432, { 5, 1, 12 }, { 5, 1, 16 } }

    {24432, { 5, 0, 24 }, { 5, 0, 38 } },

    {24432, { 5, 1, 12 }, { 5, 1, 17 } }

  };

  const uchar *master_ver=

    rli->relay_log.description_event_for_exec->server_version_split;