mysql-test/mysql-test-run.pl:
Group all code to find extra suites together
Fix problem with infinite loop by using splitdir to split the path
Use a hash to map clone name -> extr suite
mysql-test/mysql-test-run.pl:
Group all code to find extra suites together
Fix problem with infinite loop by using splitdir to split the path
Use a hash to map clone name -> extr suite
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
Don't retry by default
Fixes for --embedded
mysql-test/lib/My/ConfigFactory.pm:
Don't copy log-error to [embedded] section
mysql-test/lib/mtr_cases.pm:
Auto skip all not_embedded when running with embedded
mysql-test/mysql-test-run.pl:
Only uise one file for current test
Don't retry by default
mysql-test/t/csv.test:
Change master-data -> mysqld.1/data
mysql-test/t/innodb.test:
Change master-data -> mysqld.1/data
mysql-test/t/ps_1general.test:
Change master-data -> mysqld.1/data
mysql-test/t/trigger.test:
Change master-data -> mysqld.1/data
Disable extra team trees.
Temporary fix for entry 34761 in the bugs DB.
(Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)
mysql-test/mysql-test-run.pl:
Disable extra team trees.
Temporary fix for entry 34761 in the bugs DB.
(Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
extra/yassl/src/handshake.cpp:
Auto merged
extra/yassl/src/template_instnt.cpp:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/ndb/src/common/util/OutputStream.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
Auto merged
storage/ndb/tools/waiter.cpp:
Auto merged
Put all path conversions in one file
Convert the --tmpdir passed to "mysqld --verbose --help"
mysql-test/lib/My/Find.pm:
Use My::Platform
mysql-test/lib/My/SafeProcess.pm:
use My::Platform
mysql-test/lib/mtr_cases.pm:
Use My::Platform
mysql-test/lib/mtr_misc.pl:
Move 'mtr_native_path' to My::Platform
mysql-test/lib/My/Platform.pm:
New BitKeeper file ``mysql-test/lib/My/Platform.pm''
mysql-test/lib/t/Platform.t:
New BitKeeper file ``mysql-test/lib/t/Platform.t''
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/mysql-test-run.pl:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
manual merge
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
Auto merged
sql/log_event.cc:
Auto merged
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
Also use the opportunity to fix a bad merge (remove
duplicate code in mysql-test-run.pl).
mysql-test/mysql-test-run.pl:
Fix bad merge (remove duplicate code adding --user=root arg)
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
client/client_priv.h:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_invoked_features.result:
Manual merge.
mysql-test/suite/rpl/t/rpl_invoked_features.test:
Manual merge.
sql/log.cc:
Manual merge.
into shellback.(none):/home/msvensson/mysql/mysql-5.1-mtr
mysql-test/lib/My/SafeProcess.pm:
Auto merged
mysql-test/lib/mtr_cases.pm:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Try to dynamically change option, restart if it fails.
mysql-test/lib/mtr_cases.pm:
Try to dynamically change option, restart if it fails.
mysql-test/lib/mtr_misc.pl:
Move functions to My::Optiosn
mysql-test/lib/mtr_report.pl:
Add a small dot if test detected restart
mysql-test/lib/My/Options.pm:
New BitKeeper file ``mysql-test/lib/My/Options.pm''
mysql-test/lib/t/Options.t:
New BitKeeper file ``mysql-test/lib/t/Options.t''
