1. 14 Mar, 2008 6 commits
  2. 13 Mar, 2008 2 commits
    • unknown's avatar
      Find ndb binaries · 24640ab9
      unknown authored
      Verbose SafeProcess.pm 
      
      
      mysql-test/mysql-test-run.pl:
        Cleanup how script find ndb binaries and paths
        Remove "executable_setup_failed" code, i.e either we have ndb support or we don't
        Remove ndb_extra_test, not used by any test. If there is a need for that, just 
        create a new suite
      mysql-test/lib/My/Find.pm:
        Add possibility to use my_find_bin for a binary that is not required
      mysql-test/lib/My/SafeProcess.pm:
        Add verbose printous that can be turned on
        Wait on process also if start_kill failed
        Turn verbose on for windows
      mysql-test/lib/My/SafeProcess/safe_kill_win.cc:
        Extend sleep from 0 to 100
      mysql-test/lib/mtr_cases.pm:
        Remove ndb_extra
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
        Extra checks should be for Last_IO_Errno
      24640ab9
    • unknown's avatar
      New Makefile.am for mysql-test makes it pass also "make distcheck" and "make install" · 055d5da8
      unknown authored
      
      mysql-test/lib/My/SafeProcess/Makefile.am:
        Update Makefile.am to dist all relevant files
      055d5da8
  3. 12 Mar, 2008 5 commits
  4. 11 Mar, 2008 1 commit
  5. 10 Mar, 2008 10 commits
  6. 06 Mar, 2008 4 commits
  7. 04 Mar, 2008 4 commits
  8. 03 Mar, 2008 6 commits
  9. 28 Feb, 2008 2 commits
    • unknown's avatar
      Fix after merge · 5435b66b
      unknown authored
      
      mysql-test/extra/rpl_tests/rpl_charset.test:
        Fix merge error
      mysql-test/lib/mtr_report.pm:
        Move the . out of [] to avoid log file parsing errors
      mysql-test/mysql-test-run.pl:
        Correct spelling of option
      sql/ha_ndbcluster_binlog.cc:
        Fix merge error(used "Use remote")
      5435b66b
    • unknown's avatar
      Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl · 3320c165
      unknown authored
      into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-rpl_row_charset.test:
        Auto merged
      BitKeeper/deleted/.del-rpl_row_charset_innodb.test:
        Auto merged
      CMakeLists.txt:
        Auto merged
      client/mysqltest.c:
        Auto merged
      configure.in:
        Auto merged
      mysql-test/extra/binlog_tests/blackhole.test:
        Auto merged
      mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test:
        Auto merged
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/r/ctype_big5.result:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/mysqlbinlog.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/system_mysql_db.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/suite/federated/federated.result:
        Auto merged
      mysql-test/suite/federated/federated.test:
        Auto merged
      mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result:
        Auto merged
      mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result:
        Auto merged
      mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test:
        Auto merged
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_timezone.result:
        Auto merged
      mysql-test/suite/rpl/t/rpl_load_from_master.test:
        Auto merged
      mysql-test/suite/rpl/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/suite/rpl/t/rpl_trigger.test:
        Auto merged
      mysql-test/t/csv.test:
        Auto merged
      mysql-test/t/ctype_big5.test:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/partition.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/system_mysql_db_fix50117.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      mysql-test/t/trigger_notembedded.test:
        Auto merged
      mysql-test/t/type_blob.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      mysql-test/t/warnings.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      mysql-test/Makefile.am:
        SCCS merged
      mysql-test/mysql-test-run.pl:
        Use local version of mtr.pl
      mysql-test/lib/mtr_cases.pm:
        Use local mtr_cases.pm
      mysql-test/suite/rpl/t/disabled.def:
        Use remote disabled file
      mysql-test/t/disabled.def:
        Use remote disabled file
      sql/ha_ndbcluster_binlog.cc:
        Use remote
      mysql-test/extra/rpl_tests/rpl_charset.test:
        Manual merge
      mysql-test/lib/mtr_report.pm:
        Manual merge
      mysql-test/suite/binlog/r/binlog_killed_simulate.result:
        Manual merge
      mysql-test/suite/binlog/r/binlog_multi_engine.result:
        Manual merge
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Manual merge
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        Manual merge
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Manual merge
      mysql-test/suite/binlog/t/binlog_killed.test:
        Manual merge
      mysql-test/suite/binlog/t/binlog_killed_simulate.test:
        Manual merge
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
        Manual merge
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
        Manual merge
      mysql-test/suite/ndb/r/ndb_binlog_format.result:
        Manual merge
      mysql-test/suite/ndb/r/ndb_restore.result:
        Manual merge
      mysql-test/suite/ndb/t/ndb_restore.test:
        Manual merge
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        Manual merge
      mysql-test/suite/rpl/r/rpl_stm_log.result:
        Manual merge
      mysql-test/suite/rpl/t/rpl_row_sp005.test:
        Manual merge
      mysql-test/t/log_state.test:
        Manual merge
      mysql-test/t/mysqlbinlog.test:
        Manual merge
      mysql-test/t/mysqlbinlog2.test:
        Manual merge
      mysql-test/t/upgrade.test:
        Manual merge
      3320c165