into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
BitKeeper/etc/collapsed:
auto-union
mysql-test/r/im_daemon_life_cycle.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
mysql-test/t/sp.test:
Auto merged
server-tools/instance-manager/instance.cc:
Auto merged
server-tools/instance-manager/listener.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/lib/mtr_process.pl:
Manually merged.
mysql-test/mysql-test-run.pl:
Manually merged.
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.
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
configure.in:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/partition_mgm.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/lib/mtr_process.pl:
Apply manually the merge from 5.0
mysql-test/mysql-test-run.pl:
Apply manually the merge from 5.0
mysql-test/r/grant.result:
A post-merge fix.
mysql-test/r/im_cmd_line.result:
A post-merge fix.
mysql-test/r/im_instance_conf.result:
A post-merge fix.
mysql-test/r/sp.result:
A post-merge fix.
mysql-test/t/grant.test:
A post-merge fix.
mysql-test/t/im_cmd_line.imtest:
A post-merge fix.
mysql-test/t/im_instance_conf.imtest:
A post-merge fix.
sql/field.cc:
A post-merge fix.
sql/item_cmpfunc.cc:
A post-merge fix.
sql/sp_head.cc:
A post-merge fix.
sql/sp_head.h:
A post-merge fix.
- BUG#15934: Instance manager fails to work;
- BUG#18020: IM connect problem;
- BUG#18027: IM: Server_ID differs;
- BUG#18033: IM: Server_ID not reported;
- BUG#21331: Instance Manager: Connect problems in tests;
The only test suite has been changed
(server codebase has not been modified).
BitKeeper/deleted/.del-im_check_os.inc:
Rename: mysql-test/include/im_check_os.inc -> BitKeeper/deleted/.del-im_check_os.inc
mysql-test/include/im_check_env.inc:
Include only this file from all IM-tests.
mysql-test/lib/mtr_io.pl:
Update mtr_get_pid_from_file() to workaround race,
described in BUG#21884.
mysql-test/lib/mtr_process.pl:
Refactor im_start()/im_stop() so that they will be more
reliable. There are the following user-visible changes:
- if one of these functions fails, the test suite
is aborted;
- mtr_im_stop() now determines whether the component is
alive or not not only by checking PID, but also by trying
to connect to the component;
- after starting IM, the test suite waits for it to start
accepting client connections and to start all its guarded
mysqld instances;
- a lot of debug-logs have been added in order to simplify
investigation of future failures.
mysql-test/mysql-test-run.pl:
1. Get rid of kill_and_cleanup();
2. Move im_start()/im_stop() to mtr_process.pl;
3. Change default IM port to 9311 so that it does not interfere
with default slave port;
mysql-test/r/im_daemon_life_cycle.result:
Updated result file.
mysql-test/r/im_life_cycle.result:
Updated result file.
mysql-test/r/im_options_set.result:
Updated result file.
mysql-test/r/im_options_unset.result:
Updated result file.
mysql-test/r/im_utils.result:
Updated result file.
mysql-test/t/im_daemon_life_cycle.imtest:
Updated IM-test.
mysql-test/t/im_life_cycle.imtest:
Updated IM-test.
mysql-test/t/im_options_set.imtest:
Updated IM-test.
mysql-test/t/im_options_unset.imtest:
Updated IM-test.
mysql-test/t/im_utils.imtest:
Updated IM-test.
Split out functions that detects if we need master or slave restarts
mysql-test/lib/mtr_process.pl:
Fix spelling error
mysql-test/mysql-test-run.pl:
Move initializations of environment variables that are constant during the whole testrun to 'environment_setup'
Split out functions 'run_testcase_need_master_restart' and 'run_testcase_need_slave_restart'
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
- Make mysql-test-run.pl restart a crashed/stopped process if it was expected it should crash.
- Added testcase for "crash_commit_before", which tests behaviour when server crashes just before commit.
* The testcase first write a small var/tmp/master0.expect file indicating expected crash
* Then sets "DEBUG" variable to for example "d,crash_commit_before" and then executes a commit.
* The server will crash and be brought back up by mysql-test-run.pl
* Test case will then wait for the process to come back online before continuing.
client/mysqltest.c:
Add "die" command used to abort a failing test case
Remove unused "exit" command
mysql-test/lib/mtr_process.pl:
When a process crash during execution of mysqltest, check if it was expected and restart the process in that case.
mysql-test/mysql-test-run.pl:
Remmeber options used when ndbd's and mysqld's was started, to be used by restart code
mysql-test/r/crash_commit_before.result:
New BitKeeper file ``mysql-test/r/crash_commit_before.result''
mysql-test/include/wait_until_connected_again.inc:
New BitKeeper file ``mysql-test/include/wait_until_connected_again.inc''
mysql-test/t/crash_commit_before.test:
New BitKeeper file ``mysql-test/t/crash_commit_before.test''
mysql-test/lib/mtr_process.pl:
Resolved a previous bad merge of two different attempts at fixing the same problem.
mysql-test/mysql-test-run.pl:
Default for verbose should be Off.
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
BUILD/compile-dist:
Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/create_not_windows.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
mysys/my_lib.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/unireg.cc:
Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
manuakl merge
mysql-test/lib/mtr_process.pl:
manuakl merge
mysql-test/mysql-test-run.pl:
manuakl merge
mysql-test/r/type_newdecimal.result:
manuakl merge
mysql-test/t/create.test:
manuakl merge
mysql-test/t/func_group.test:
manuakl merge
mysql-test/t/type_newdecimal.test:
manuakl merge
- fix for IM stopping routine;
- polishing.
mysql-test/lib/mtr_process.pl:
Polishing: make mtr_kill_process() more verbose in debug mode.
mysql-test/mysql-test-run.pl:
1. Fix stopping of IM running as a daemon -- after death of the main IM
process, we should wait for the IM angel to die.
2. Polishing -- be more verbose in debug mode.
Run ndb_mgmd as deamon
Make extra attempt to check if processes are still alive
mysql-test/lib/mtr_process.pl:
Add common function to mark processes as dead
When all attempts to kil processes has failed make an extra attempt with ping to check if they really are still alive
mysql-test/mysql-test-run.pl:
Run ndb_mgmd with --nodaemon
Make list of tags/name/values to simplify adding more tags
Check if debug compiled binaries
mysql-test/lib/mtr_cases.pl:
Fix warnings
Use local file handle for recursive "include file" loop
Make list of tags/name/value to search for in .test files
Add fileter for "require debug compiled binary"
mysql-test/lib/mtr_process.pl:
Fix warnings
mysql-test/lib/mtr_report.pl:
Fix warning, only print total time if "--timer"
mysql-test/mysql-test-run.pl:
Fix warnings
Add check of debug compiled binaries
Leave it to the implementation of 'mtr_kill_process' how long to wait between each attempt to kill/detect if process has been killed.
mysql-test/lib/mtr_process.pl:
Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
mysql-test/mysql-test-run.pl:
Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
mysql-test/lib/mtr_process.pl:
Don't send port for ndb_mgmd to mtr_check_stop_servers.
mysql-test/mysql-test-run.pl:
Don't send port for ndb_mgmd to mtr_check_stop_servers.
mysql-test/lib/mtr_process.pl:
Fix spelling errors
mysql-test/lib/mtr_report.pl:
Fix spelling errors
mysql-test/mysql-test-run.pl:
Remove debug code
Fix spelling errors
Check if slave cluster installed ok if test needs it
Add verbose printouts
mysql-test/lib/mtr_process.pl:
Add verbose printouts
mysql-test/mysql-test-run.pl:
Wait until first mysqld in slave cluster has created cluster/apply_status.ndb, put workaround in function workaround_hang_in_select
Add list of clusters and nodes
mysql-test/lib/mtr_process.pl:
Start servers in parallell
mysql-test/lib/mtr_report.pl:
Report about number of restarts
mysql-test/lib/mtr_stress.pl:
Update args to pass to mysqld_start
mysql-test/mysql-test-run.pl:
Start servers in parallell
Add lists for clusters and it's nodes to keep track of things
into mysql.com:/usr/local/mysql/merge-5.1
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/trigger-grant.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger-grant.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
server-tools/instance-manager/options.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
server-tools/instance-manager/options.cc:
Manual merge
sql/item_func.cc:
Manual merge
sql/mysql_priv.h:
Manual merge
sql/sp_head.cc:
Manual merge
sql/sql_table.cc:
Manual merge
tests fail on FreeBSD.
The patch contains of the following:
- make Instance Manager, running in the daemon mode, dump
the pid of angel-process in the special file;
- default value of angel-pid-file-name is 'mysqlmanager.angel.pid';
- if ordinary (IM) pid-file-name is specified in the configuration,
angel-pid-file-name is updated according to the following
rule: extension of the basename of pid-file-name is replaced by
'.angel.pid.
For example:
- pid-file-name: /tmp/im.pid
=> angel-pid-file-name: /tmp/im.angel.pid
- pid-file-name: /tmp/im.txt
=> angel-pid-file-name: /tmp/im.angel.pid
- pid-file-name: /tmp/5.0/im
=> angel-pid-file-name: /tmp/5.0/im.angel.pid
- add support for configuration option to customize angel
pid file name;
- fix test suite to use angel pid to kill Instance Manager
by all means if something went wrong.
Background
----------
The problem is that on some OSes (FreeBSD for one) Instance
Manager does not get SIGTERM, so can not shutdown gracefully.
Test suite wasn't able to cope with it, so this leads to the
mess in test results.
The problem should be split into two:
- fix signal handling;
- fix test suite.
This patch fixes test suite so that it will be able to kill
uncooperative Instance Manager. In order to achieve this,
test suite needs to know PID of IM Angel process.
mysql-test/lib/mtr_process.pl:
Added a function to send a signal to a process.
mysql-test/mysql-test-run.pl:
Changed procedure of stopping Instance Manager.
1. Try to stop IM normally (by sending SIGTERM);
2. If one of IM-related processes is still alive,
kill them all by SIGKILL and complain in the log.
server-tools/instance-manager/manager.cc:
Made create_pid_file() available for the whole project.
server-tools/instance-manager/manager.h:
Made create_pid_file() available for the whole project.
server-tools/instance-manager/mysqlmanager.cc:
Dump PID of angel process into file.
server-tools/instance-manager/options.cc:
Added an option to allow to customize angel pid file name.
server-tools/instance-manager/options.h:
Added an option to allow to customize angel pid file name.
config/ac-macros/yassl.m4:
Fix like of yassl makefiles after merge
mysql-test/lib/mtr_process.pl:
Re-add line accidently cut out during merge
mysql-test/mysql-test-run.pl:
Don't start up ndbcluster slave if we don't need it, and fix how
NDB_STATUS_OK is defined
mysql-test/r/rpl_openssl.result:
Update results
sql/mysqld.cc:
Remove duplicate of have_dlopen (bad merge)
sql/set_var.cc:
Remove duplicate of prepared_stmt_count (bad merge)
into mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-mysql_upgrade.dsp:
Delete: VC++Files/client/mysql_upgrade.dsp
BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
Delete: VC++Files/client/mysql_upgrade_ia64.dsp
BitKeeper/deleted/.del-mysql_upgrade.c:
Delete: client/mysql_upgrade.c
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysql.sln:
Auto merged
VC++Files/mysql_ia64.dsw:
Auto merged
client/mysql.cc:
Auto merged
config/ac-macros/zlib.m4:
Auto merged
configure.in:
Auto merged
extra/yassl/Makefile.am:
Auto merged
extra/yassl/taocrypt/Makefile.am:
Auto merged
include/my_global.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.def:
Auto merged
libmysqld/libmysqld.def:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/rpl_openssl.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
client/Makefile.am:
Resolve conflict
config/ac-macros/yassl.m4:
Resolve conflict
mysql-test/include/have_udf.inc:
Resolve conflict
mysql-test/lib/mtr_process.pl:
Resolve conflict
mysql-test/mysql-test-run.pl:
Resolve conflict
mysql-test/r/have_udf.require:
Resolve conflict
mysql-test/r/rpl_openssl.result:
Resolve conflict
mysql-test/t/disabled.def:
Resolve conflict
mysql-test/t/information_schema.test:
Resolve conflict
server-tools/instance-manager/instance_options.cc:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/set_var.cc:
Resolve conflict
support-files/mysql.spec.sh:
Resolve conflict
- Log boostratp/install to var/log/boostrap.log
- Log output from mysqladmin to var/log/mysqladmin.log
- Remove old manager references
mysql-test/lib/mtr_process.pl:
Log output from mysqladmin to var/log/mysqladmin.log
mysql-test/mysql-test-run.pl:
Log output from boostrap/install of db's to var/log/bootstrap.log
Remove references to old manager
- Part 1, better handling of subprocess and stdout to be done
mysql-test/lib/mtr_process.pl:
- Dont redirect stdout if ActiveState perl since fork creates a new thread and not another process.
- Change waitpid to allow for negative pid as we get on Windows, strange but
that is how it is. It should never create a process with pid -1 though.
- Remove an "if" for cygwin that does not do anything.
- Add "print" in the potentially hanging while loop in "start_reap_all"
- Dont use "getpgrp" on windows.
- Remove "sleep 2" in mtr_exit
- Remove the initial ping of mysqld's in 'mysql_admin_shutdown', instead just start one
mysqladmin for each expected mysqld server and wait for them to return.
Then perform the ping of the mysqld server's. Those ping's normally return immediately.
mysql-test/lib/mtr_process.pl:
Change from "mtr_error()" to "mtr_warning()" on some problems,
because "error" makes the whole suite abort which then makes "Do-compile" terminate,
so none of the following steps (including other etst suites) will be done.
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.
mysql-test/lib/mtr_process.pl:
Fix race (on some platforms) when killing processes.
Added --skip-im option handling
Don't terminate script if IM fails to create PID file
mtr_cases.pl:
Added --skip-im option handling
mtr_process.pl:
Kill left over 'mysqld' processes started by IM
mysql-test/lib/mtr_process.pl:
Kill left over 'mysqld' processes started by IM
mysql-test/lib/mtr_cases.pl:
Added --skip-im option handling
mysql-test/mysql-test-run.pl:
Added --skip-im option handling
Don't terminate script if IM fails to create PID file
1) Add support to testing Instance Manager in daemon mode;
2) Don't run Instance Manager tests when running with --ps-protocol option;
mysql-test/lib/mtr_cases.pl:
WL#2789 "Instance Manager: test using mysql-test-run testing framework"
Skip/disable Instance Manager tests in the following cases:
- we are testing embedded server;
- we are running with --ps-protocol;
- Instance Manager executable does not exist;
Report about the reason in the standard way.
mysql-test/lib/mtr_process.pl:
WL#2789 "Instance Manager: test using mysql-test-run testing framework"
Make several attempts (i.e. send several signals to process) while trying to kill it.
mysql-test/mysql-test-run.pl:
WL#2789 "Instance Manager: test using mysql-test-run testing framework"
Add support for testing Instance Manager in daemon mode.
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
os2/MySQL-Source.icc:
Auto merged
regex/Makefile.am:
Auto merged
regex/engine.c:
Auto merged
regex/main.c:
Auto merged
regex/regerror.c:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/lib/mtr_process.pl:
Handle errors in child processes separate from the parent process (patch supplied by Kent).
mysql-test/lib/mtr_report.pl:
New function to handle errors in child processes separate from the parent process (patch supplied by Kent).
Expected to avoid HUP signals.
