mysql-test/mysql-test-run.pl:
Initialise pid to 0 in arrays of masters and slaves
Fix merge error
mysql-test/lib/mtr_cases.pl:
Remove "chomp" on undefined
into shellback.(none):/home/msvensson/mysql/work/my51-work
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/lib/mtr_stress.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Merge 5.0 -> 5.1
installed charset dir being used.
mysql-test/mysql-test-run.pl:
Add character-sets-dir argument to "mysql". That avoids a local
installed charset dir being used.
when mysql-test-run.pl has full control of all ndb processes. It will now know if
install has failed.
BitKeeper/deleted/.del-have_ndb_status_ok.require:
Delete: mysql-test/r/have_ndb_status_ok.require
mysql-test/include/have_ndb.inc:
Remove the test to check if environment variable NDB_STATUS_OK is set
mysql-test/mysql-test-run.pl:
Don't set env variable NDB_STATUS_OK or NDB_SLAVE_STATUS_OK
Use 1 and 0 to indicate if cluster has been installed ok.
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
include/my_net.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
- Disable generation of core file and stacktrace when running this testcase, which would
otherwise mark the whole testsuite as failed.
mysql-test/mysql-test-run.pl:
Allow --skip-core-file to be specified in master.opt file, which will turn
off the default behaviour to generate core file.
Remove the option --exit-info from being passed to myslqd when it's started. If used
it will just overwrite all the options for skip-stack-trace etc.
mysql-test/t/disabled.def:
Enable crash_commit_before
mysql-test/t/crash_commit_before-master.opt:
Run crash_commit_before test case without core file and stack trace.
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Merge
to start instance manager.
The problem was that if IM failed to start, test suite aborts.
The fix is to mark current test as failed, and continue running
test suite.
The fix affects only test suite.
mysql-test/mysql-test-run.pl:
Report IM-test as failed if IM failed to start.
to start instance manager.
The problem was that if IM failed to start, test suite aborts.
The fix is to mark current test as failed, and continue running
test suite.
The fix affects only test suite.
The patch affects only test suite and has the following changes:
1. On starting Instance Manager -- added code for waiting for guarded
mysqld instances to create PID files;
2. Polishing;
3. Move IM-related operations out of mtr_process.pl into new dedicated
for IM file -- mtr_im.pl
mysql-test/mysql-test-run.pl:
1. Require new file with IM-related operations;
2. Added timeout to wait for PID files of guarded instances;
3. Polishing.
mysql-test/lib/mtr_process.pl:
Move IM-related operations to new file.
mysql-test/lib/mtr_im.pl:
File for IM-related operations.
The patch affects only test suite and has the following changes:
1. On starting Instance Manager -- added code for waiting for guarded
mysqld instances to create PID files;
2. Polishing;
3. Move IM-related operations out of mtr_process.pl into new dedicated
for IM file -- mtr_im.pl
into bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/events.result:
Auto merged
mysql-test/r/not_embedded_server.result:
Auto merged
mysql-test/t/events.test:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
