1. 04 Aug, 2008 1 commit
    • Sven Sandberg's avatar
      merged 5.1 main to 5.1-rpl · 73e25337
      Sven Sandberg authored
      manually resolved conflicts:
      Text conflict in client/mysqltest.c
      Contents conflict in mysql-test/include/have_bug25714.inc
      Text conflict in mysql-test/include/have_ndbapi_examples.inc
      Text conflict in mysql-test/mysql-test-run.pl
      Text conflict in mysql-test/suite/parts/inc/partition_check_drop.inc
      Text conflict in mysql-test/suite/parts/inc/partition_layout.inc
      Text conflict in mysql-test/suite/parts/inc/partition_layout_check1.inc
      Text conflict in mysql-test/suite/parts/inc/partition_layout_check2.inc
      Text conflict in mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
      Text conflict in mysql-test/suite/parts/r/partition_alter1_1_myisam.result
      Text conflict in mysql-test/suite/parts/r/partition_alter1_2_myisam.result
      Text conflict in mysql-test/suite/parts/r/partition_alter2_myisam.result
      Text conflict in mysql-test/suite/parts/r/partition_alter3_innodb.result
      Text conflict in mysql-test/suite/parts/r/partition_alter3_myisam.result
      Text conflict in mysql-test/suite/parts/r/partition_basic_innodb.result
      Text conflict in mysql-test/suite/parts/r/partition_basic_myisam.result
      Text conflict in mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
      Text conflict in mysql-test/suite/parts/r/partition_engine_myisam.result
      Text conflict in mysql-test/suite/parts/r/partition_syntax_myisam.result
      Text conflict in mysql-test/suite/rpl_ndb/t/disabled.def
      Text conflict in mysql-test/t/disabled.def
      73e25337
  2. 28 Jul, 2008 1 commit
  3. 25 Jul, 2008 2 commits
  4. 24 Jul, 2008 7 commits
  5. 23 Jul, 2008 1 commit
    • Sven Sandberg's avatar
      BUG#37717: rpl.rpl_stm_until 'stmt' fails sporadically on pushbuild · b6545b30
      Sven Sandberg authored
      Problem: After START SLAVE, the Slave_IO_Status column of
      SHOW SLAVE STATUS goes from No to Yes asynchronously. That
      caused sporadic failures on pushbuild in rpl_stm_until since
      the test contains SHOW SLAVE STATUS right after START SLAVE.
      Fix: Wait until Slave_IO_Status becomes Yes after each
      START SLAVE.
      b6545b30
  6. 22 Jul, 2008 11 commits
  7. 21 Jul, 2008 4 commits
  8. 24 Jul, 2008 1 commit
  9. 21 Jul, 2008 3 commits
  10. 24 Jul, 2008 1 commit
  11. 21 Jul, 2008 2 commits
  12. 19 Jul, 2008 4 commits
  13. 18 Jul, 2008 2 commits