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.
client/mysqltest.c:
Dump accumulated result upuntil test failure into a <testname>.log file for later examination
mysql-test/lib/mtr_report.pl:
Inform about the <testname>.log file's existence
into mysql.com:/usr/local/mysql/mysql-5.0
mysql-test/lib/mtr_timer.pl:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
mysql-test/lib/mtr_timer.pl:
Fix bug where ^C would trigger cleanup handler in both parent and
timeout child processes, causing duplicated messages and potential
conflicts.
- Back porting of some changes in later releases
- Corrected valgrind support
- Removed work around for TZ needed in VisualStudio 6
- Don't restart master to add special settings from "<testcase>-master.opt",
if same settngs as running master, feature request in bug#12433
- With --reorder, keep tests with same *-master.opt content together,
to save even more master restarts
mysql-test/lib/mtr_misc.pl:
Added functions to compare lists of options
mysql-test/lib/mtr_cases.pl:
Removed special code for Windows as in VC6 we unset
TZ to avoid library bug
mysql-test/mysql-test-run.pl:
Handle pseudo option --timezone=<spec> that sets TZ
- Fix problems that occur when ndbcluster is not supported
mysql-test/lib/mtr_cases.pl:
Marked test to be skipped if it is a ndb test but ndb is not supported
mysql-test/mysql-test-run.pl:
Check "opt_with_ndbcluster" before deciding to stop masters and when dciding if cluster needs to be started.
mysql-test/lib/mtr_cases.pl:
Always set "ndb_test" if tets name contains ndb.
Set to skipped if "--skip-ndbcluster"
mysql-test/lib/mtr_report.pl:
Print special error message for ndb_test that are failed due to failure to start or install ndbcluster
mysql-test/mysql-test-run.pl:
Remove mtr_error call from ndbcluster_install, instead check after ndbcluster_install if test run should continue or if it should be aborted
Faile ndb test and print special error message if it's a ndb test and flag_ndb_status_ok is not ok
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/spatial.cc:
Auto merged
Added { ... } around float8get() macro, avoids VC7 error
message "illegal else without matching if"
mtr_report.pl:
Parse error logs to create "warnings" file
mtr_cases.pl:
Added optoion --ignore-disabled-def
Windows build now let TZ pass, removed
work around
mysql-test-run.pl, mtr_process.pl:
Back port of changes from 5.0
mysql-test/lib/mtr_process.pl:
Back port of changes from 5.0
mysql-test/mysql-test-run.pl:
Back port of changes from 5.0
mysql-test/lib/mtr_cases.pl:
Added optoion --ignore-disabled-def
Windows build now let TZ pass, removed
work around
mysql-test/lib/mtr_report.pl:
Parse error logs to create "warnings" file
sql/spatial.cc:
Added { ... } around float8get() macro, avoids VC7 error
message "illegal else without matching if"
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.
not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not
need to be contacted for each table to be dropped or created.
Backport from 5.1
mysql-test/lib/mtr_cases.pl:
Mark all test cases where name contains "ndb" as ndbcluster needed
mysql-test/lib/mtr_match.pl:
Add mtr_match_substring function
mysql-test/lib/mtr_stress.pl:
Extre param to mysqld_start
mysql-test/mysql-test-run.pl:
Only start ndbcluster for testcases that needs it.
with 20 test loops in case when any limit parameter was specified
mysql-test/lib/mtr_stress.pl:
Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.pl:
Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.sh:
Limit stress testing with 20 test loops in case when any limit parameter was specified
Corrected function declaration
mysql-test/lib/mtr_misc.pl:
Corrected function declaration
mysql-test/mysql-test-run.pl:
Added support of stress mode
mysql-test/lib/mtr_stress.pl:
Added support of stress mode
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
mysql-test/lib/init_db.sql:
Data type of the "Password" column has been changed in "mysql_create_system_tables",
this must be reflected here (until they are united). bug#14023
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.
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
BUILD/SETUP.sh:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/des_key_file.cc:
Auto merged
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
Text formatting, adjust table header
mysql-test-run.pl:
Remove requirement for source tree to run embedded server test
mysqldump.test:
Removed ending ';' from --exec line
mysql-test/t/mysqldump.test:
Removed ending ';' from --exec line
mysql-test/mysql-test-run.pl:
Remove requirement for source tree to run embedded server test
mysql-test/lib/mtr_report.pl:
Text formatting, adjust table header
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.
mysql-test/lib/mtr_report.pl:
Make the Perl test script output identical to that of the (old) shell script,
so that reported differences compare as equal strings (for automatic analysis).
Make sure mtr_kill_processes() is called with an array ref
Corrected error string for STDERR redirect
mysql-test/lib/mtr_process.pl:
Make sure mtr_kill_processes() is called with an array ref
Backporting from 5.0
mysql-test/mysql-test-run.pl:
Backporting from 5.0
mysql-test/lib/mtr_process.pl:
Backporting from 5.0
mysql-test/lib/mtr_report.pl:
Backporting from 5.0
mysql-test/lib/mtr_timer.pl:
Backporting from 5.0
mysql-test/Makefile.am:
Make installation procedure aware of the Instance Manager tests.
mysql-test/lib/mtr_cases.pl:
Make collect_one_test_case() aware of the Instance Manager tests.
mysql-test/lib/mtr_process.pl:
Minor changes:
- open log files for append, not for overwrite. Append mode is very
useful for debugging of several tests;
- extract the code for killing processes into a separate function:
mtr_kill_processes(). The function is used to stop IM-related processes.
mysql-test/mysql-test-run.pl:
Added support for the Instance Manager tests.
Call mtr_timer_stop_all() at exit
mtr_report.pl, mysql-test-run.pl:
Added default/ps-protocol/embedded to abort and summary line
mtr_timer.pl:
Added function mtr_timer_stop_all()
mysql-test/mysql-test-run.pl:
Added default/ps-protocol/embedded to abort and summary line
mysql-test/lib/mtr_timer.pl:
Added function mtr_timer_stop_all()
mysql-test/lib/mtr_report.pl:
Added default/ps-protocol/embedded to abort and summary line
mysql-test/lib/mtr_process.pl:
Call mtr_timer_stop_all() at exit
into mishka.local:/home/my/mysql-5.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
BitKeeper/deleted/.del-have_lowercase0.inc:
Delete: mysql-test/include/have_lowercase0.inc
VC++Files/mysql-test/mysql_test_run_new.dsp:
Auto merged
configure.in:
Auto merged
mysql-test/include/ps_conv.inc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_example.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
VC++Files/client/mysqltest.dsp:
manual merge
VC++Files/sql/mysqld.dsp:
manual merge
mysql-test/r/grant2.result:
patch merge
mysql-test/r/subselect2.result:
manual merge
mysql-test/t/grant2.test:
patch merge
mysys/charset.c:
Remove already deleted function
sql/examples/ha_archive.h:
Manual merge
sql/sql_acl.cc:
manual merge
sql/sql_db.cc:
merge (no differences)
sql/sql_select.cc:
manual merge
sql/table.h:
merge (no differences)
tests/mysql_client_test.c:
patch merge
mysql-test/lib/init_db.sql:
this should be longblob or info_schema test will fail
mysql-test/r/rpl_delete_all.result:
fix result of a test, the error message is different (bug #12591)
mysql-test/t/rpl_delete_all.test:
fix test, now the error code is different (bug #12591)
into mysql.com:/home/emurphy/src/work/mysql-5.0
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
include/m_ctype.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysys/charset.c:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-czech.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-extra.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
configure.in:
Manual merge from 4.1
include/config-netware.h:
Manual merge from 4.1
sql/item.cc:
Manual merge from 4.1
sql/mysqld.cc:
Manual merge from 4.1
Added suite and test case timeout
mtr_timer.pl:
new file
mysql-test/lib/mtr_process.pl:
Added suite and test case timeout
mysql-test/lib/mtr_report.pl:
Added suite and test case timeout
mysql-test/mysql-test-run.pl:
Added suite and test case timeout
mysql-test/lib/mtr_timer.pl:
Added suite and test case timeout
Longer shutdown timeout, slave may be in reconnect
HUP seem to disturb exit(), added sleep to make sure
output is flushed
mysql-test/lib/mtr_process.pl:
Longer shutdown timeout, slave may be in reconnect
HUP seem to disturb exit(), added sleep to make sure
output is flushed
Bug#12615: Host name might not resolve, use short host name
mysql-test/lib/mtr_misc.pl:
Bug#12615: Host name might not resolve, use short host name
mysql-test/mysql-test-run.pl:
Bug#12615: Host name might not resolve, use short host name
Bug#11792: Check all of status code, to catch a crash as a failure
mtr_cases.pl:
Code cleanup for skipped/disabled handling
mtr_process.pl:
In debug mode, report if mysqladmin did not at least
make the server stop listening to the port.
Increased the time waiting for terminating to 20 seconds,
to wait for really slow slave shutdown.
Added call to start_reap_all(), to avoid zombies.
mtr_report.pl:
Removed prototype for unused function mtr_report_test_disabled()
mysql-test/lib/mtr_report.pl:
Removed prototype for unused function mtr_report_test_disabled()
mysql-test/lib/mtr_cases.pl:
Code cleanup for skipped/disabled handling
mysql-test/lib/mtr_process.pl:
Bug#11792: Check all of status code, to catch a crash as a failure
Bug#12094: Let sleep_until_file_created() return the pid as intended
mysql-test/lib/mtr_process.pl:
Bug#12094: Let sleep_until_file_created() return the pid as intended
