1. 23 Sep, 2006 4 commits
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · 561bed71
      unknown authored
      into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
      
      
      561bed71
    • unknown's avatar
      binlog_row_binlog test gained some indeterministic checks with changes due to · 99f8d0a4
      unknown authored
      ChangeSet@1.2309.1.12, 2006-09-12 15:42:13+02:00, guilhem@gbichot3.local +14 -0
        Fixing problems I identified in my auto_increment work pushed in July
        (as part of the auto_increment cleanup of WL #3146; ...
      The problem is in that show binlog events in indeterministic, row events can be compressed,
      so that 2 seconds original delay does not guard from inconsistency.
      
      We syncronize test's current inserted rows counter with system insert delayed thread
      per each query.
      
      From another side there is no requirement for binlog to be event per row and then 
      to verify if binlog has recorded what was recently inserted is better
      via reading from it instead of 'show binlog events'. 
      
      
      mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
        removing sleeps, syncronizing with system delayed thread per each statement,
        note that an insert statement is performed atomically including writing to binlog,
        so that concurrent selects are waiting. That's why the wait macro is safe.
      mysql-test/r/binlog_row_binlog.result:
        new result
      mysql-test/include/wait_until_rows_count.inc:
        macro implements waiting until a targeted table has a prescribed rows number.
      99f8d0a4
    • unknown's avatar
      Disabling test case · 3bd90044
      unknown authored
      3bd90044
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 7671fbc2
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/t/disabled.def:
        Auto merged
      sql/CMakeLists.txt:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      7671fbc2
  2. 22 Sep, 2006 4 commits
  3. 21 Sep, 2006 22 commits
  4. 20 Sep, 2006 9 commits
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · 0c3f4e11
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
      
      
      mysql-test/r/rpl_view.result:
        Auto merged
      mysql-test/t/rpl_view.test:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/mysqldump.result:
        Manual merge, merge trees 5.0->5.1
      0c3f4e11
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · 679ed1c8
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      sql/sql_yacc.yy:
        Auto merged
      679ed1c8
    • unknown's avatar
      Fix of result files from merge · aede420d
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Fix of result file (adding the echo's)
      mysql-test/r/rpl_view.result:
        Added end of 5.0 echo
      mysql-test/t/rpl_view.test:
        Added end of 5.0 echo
      aede420d
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · d6b1188f
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
      
      
      client/mysqldump.c:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      mysql-test/r/mysqldump.result:
        Manual merge, merge tree 5.0->5.1
      mysql-test/r/rpl_view.result:
        Manual merge, merge tree 5.0->5.1
      mysql-test/t/mysqldump.test:
        Manual merge, merge tree 5.0->5.1
      mysql-test/t/rpl_view.test:
        Manual merge, merge tree 5.0->5.1
      d6b1188f
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · c441c64e
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      Makefile.am:
        Auto merged
      client/mysqldump.c:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/CMakeLists.txt:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      mysql-test/r/mysqldump.result:
        Restoring rpl tree mysqldump test file to main tree test files
      mysql-test/r/status.result:
        Manual merge
      mysql-test/t/mysqldump.test:
        Restoring rpl tree mysqldump test file to main tree test files
      c441c64e
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · edbab357
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      client/mysqldump.c:
        Merge main->rpl
      mysql-test/r/mysqldump.result:
        Restore of main mysqldump test files in rpl tree (only added echo and one test case for bug 13926)
        Printouts not yet added to result file
      mysql-test/t/mysqldump.test:
        Restore of main mysqldump test files in rpl tree (only added echo and one test case for bug 13926)
      edbab357
    • unknown's avatar
      Merge xiphis.org:/home/antony/work2/p2-bug22417.1 · 5ff80c2f
      unknown authored
      into  xiphis.org:/home/antony/work2/p2-bug22417.2
      
      
      5ff80c2f
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 941e5020
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
      
      
      sql/sql_yacc.yy:
        Auto merged
      941e5020
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.1--team · e0bca512
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-tomain
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Manual merge from 5.1-engines.
      e0bca512
  5. 19 Sep, 2006 1 commit
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-bug14400-monty · a84f71b9
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug14400-monty
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_global.h:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      storage/myisam/mi_rkey.c:
        Auto merged
      storage/myisam/mi_test_all.res:
        Auto merged
      storage/myisam/mi_test_all.sh:
        Merge from 5.0.
      a84f71b9