An error occurred fetching the project authors.
  1. 20 Jun, 2007 5 commits
  2. 19 Jun, 2007 12 commits
  3. 18 Jun, 2007 23 commits
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 511ef0cc
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
      
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        Auto merged
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        Auto merged
      mysql-test/t/rpl_ndb_bank.test:
        Auto merged
      mysql-test/t/rpl_ndb_basic.test:
        Auto merged
      mysql-test/t/rpl_ndb_do_table.test:
        Auto merged
      mysql-test/t/rpl_ndb_idempotent.test:
        Auto merged
      mysql-test/t/rpl_ndb_stm_innodb.test:
        Auto merged
      mysql-test/t/rpl_ndb_sync.test:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      mysql-test/include/have_multi_ndb.inc:
        manual merge
      mysql-test/include/have_ndb.inc:
        manual merge
      mysql-test/t/rpl_ndb_commit_afterflush.test:
        manual merge
      mysql-test/t/rpl_ndb_ddl.test:
        manual merge
      mysql-test/t/rpl_ndb_innodb_trans.test:
        manual merge
      511ef0cc
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · ea8934c5
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/pgman.cpp:
        Auto merged
      ea8934c5
    • unknown's avatar
      check for different error message · 76eb66ea
      unknown authored
      76eb66ea
    • unknown's avatar
      ndb - bug#29176 missing stack pruning in drop_page · ccb8da82
      unknown authored
      storage/ndb/src/kernel/blocks/pgman.cpp:
        missing stack pruning in drop_page
      ccb8da82
    • unknown's avatar
      correction · a2002da6
      unknown authored
      a2002da6
    • unknown's avatar
      Bug #28989 hpux11 ps_row warnings · 2e08341c
      unknown authored
      - also remove printout for error 4009
      
      
      2e08341c
    • unknown's avatar
      fixes Bug #25305 (and several other similar test tailures with the same symptom) · 2c631fe8
      unknown authored
      - make tests wait until ndb connects properly
      
      
      mysql-test/extra/rpl_tests/rpl_commit_after_flush.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_delete_no_where.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_insert_ignore.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_log.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_multi_update2.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_multi_update3.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_relayrotate.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_001.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_UUID.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_blob.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_func003.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_sp003.test:
        make tests wait until ndb connects properly
      mysql-test/extra/rpl_tests/rpl_row_sp006.test:
        make tests wait until ndb connects properly
      mysql-test/include/have_multi_ndb.inc:
        make tests wait until ndb connects properly
      mysql-test/include/have_ndb.inc:
        make tests wait until ndb connects properly
      mysql-test/include/ndb_not_readonly.inc:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_commit_after_flush.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_delete_no_where.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_insert_ignore.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_multi_update2.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_multi_update3.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_2innodb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_2myisam.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_UUID.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_auto_inc.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_bank.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_basic.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_blob.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_blob2.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_charset.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_circular.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_circular_simplex.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_commit_afterflush.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_dd_advance.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_dd_basic.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_dd_partitions.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_ddl.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_delete_nowhere.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_do_db.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_do_table.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_extraCol.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_func003.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_idempotent.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_innodb2ndb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_innodb_trans.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_insert_ignore.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_load.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_log.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_multi.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_multi_update2.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_multi_update3.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_myisam2ndb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_relayrotate.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_rep_ignore.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_row_001.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_sp003.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_sp006.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_stm_innodb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_sync.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndb_trig004.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_ndbapi_multi.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_relayrotate.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_001.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_UUID.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_basic_2myisam.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_basic_3innodb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_basic_7ndb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_blob_innodb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_blob_myisam.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_charset.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_func003.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_log.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_log_innodb.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_sp003.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_row_sp006_InnoDB.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_stm_log.test:
        make tests wait until ndb connects properly
      mysql-test/t/rpl_truncate_7ndb.test:
        make tests wait until ndb connects properly
      mysql-test/include/ndb_master-slave.inc:
        New BitKeeper file ``mysql-test/include/ndb_master-slave.inc''
      2c631fe8
    • unknown's avatar
      Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · 9d09201a
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
      
      
      9d09201a
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · 0e895c1c
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      mysql-test/t/innodb.test:
        Auto merged
      0e895c1c
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · 6da3c0fa
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/ndb_basic.test:
        Auto merged
      mysql-test/t/ndb_insert.test:
        Auto merged
      mysql-test/t/ndb_restore.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisammrg/ha_myisammrg.h:
        Auto merged
      sql/share/errmsg.txt:
        SCCS merged
      6da3c0fa
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 7969b6a6
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      7969b6a6
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 66330935
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      66330935
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · 7011a51e
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
      
      
      7011a51e
    • unknown's avatar
      Fixes to make team-tree green. · 48c9f3bc
      unknown authored
      mysql-test/r/binlog_multi_engine.result:
        Result change
      mysql-test/t/binlog_multi_engine.test:
        Commenting out statements that generate non-deterministic results.
      48c9f3bc
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · f9c8d1dd
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/ndb_basic.test:
        Auto merged
      mysql-test/t/ndb_charset.test:
        Auto merged
      mysql-test/t/ndb_index_unique.test:
        Auto merged
      mysql-test/t/ndb_insert.test:
        Auto merged
      mysql-test/t/ndb_replace.test:
        Auto merged
      mysql-test/t/ndb_update.test:
        Auto merged
      mysql-test/t/rpl_000015.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/rpl_row_inexist_tbl.test:
        Auto merged
      sql/Makefile.am:
        Auto merged
      BitKeeper/deleted/.del-ndb_binlog_basic2.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      sql/item_create.cc:
        Manual merge
      f9c8d1dd
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · caf55fff
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      mysql-test/t/innodb.test:
        Auto merged
      caf55fff
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · eff58f51
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
      
      
      eff58f51
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · 1140898b
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      1140898b
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5504ca39
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      configure.in:
        Auto merged
      5504ca39
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4831826c
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
      
      
      4831826c
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 39481ed4
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
      
      
      39481ed4
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 4b4c887a
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
      
      
      configure.in:
        Auto merged
      4b4c887a
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 9b1aa63e
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      9b1aa63e