Commit graph

350 commits

Author SHA1 Message Date
unknown
d4aadb0613 Get name for .reject and .log files from result file name 2006-11-21 15:16:12 +01:00
unknown
346a911863 Merge mysql.com:/home/df/mysql/build/mysql-5.0-build-work
into  mysql.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-17 17:09:52 +01:00
unknown
880b4e8725 adaption from 4.1 2006-11-17 17:02:28 +01:00
unknown
c3d6927d58 MTR_BUILD_THREAD=auto selects a value for MTR_BUILD_THREAD from a pool (WL#2690)
mysql-test/lib/mtr_unique.pl:
  Library file used by mysql-test-run.pl to determine unique test run identifiers.
2006-11-17 16:52:21 +01:00
unknown
0aad12d99e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use remote
2006-11-17 14:45:08 +01:00
unknown
ff5062caea Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge backport
2006-11-17 13:41:18 +01:00
unknown
02cd4f5ada BUG#24274 option "--big-test" of mysql-test-run.pl does not work anymore
mysql-test/lib/mtr_cases.pl:
  Don't look at lines that start with # ie. a comment
mysql-test/mysql-test-run.pl:
  Set env BIG_TEST if --big-test passed
2006-11-17 13:14:07 +01:00
unknown
060c768c2b Bug#24274 option "--big-test" of mysql-test-run.pl does not work anymore
- Set environment variable BIG_TEST when using --big-test
 - Skip comment lines when looking for features a test case supports.


mysql-test/lib/mtr_cases.pl:
  Skip all lines that start with # when looking for features required by the test case
mysql-test/mysql-test-run.pl:
  Set environment variable BIG_TEST if option --big-test passed.
2006-11-17 11:01:09 +01:00
unknown
1707d5e6e0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-09 15:36:13 -05:00
unknown
2ab1706190 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/Makefile.am:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged
2006-11-04 09:32:36 +01:00
unknown
4c503b8dde Merge neptunus.(none):/home/msvensson/mysql/my50-m-stress
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-04 09:20:20 +01:00
unknown
a1c7999550 Fiexes for --stress mode in mysql-test-run.pl
mysql-test/lib/mtr_stress.pl:
  "stop_masters" function renamed to "stop_all_servers"
  "path_mysock" renamed to "path_sock"
2006-11-03 17:53:57 +01:00
unknown
c88ab7a093 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_lock.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-11-03 17:53:10 +01:00
unknown
6215085143 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysys/my_lock.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  Manual merge
myisam/sort.c:
  Manual merge(double checked)
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge
mysys/mf_iocache.c:
  Manual merge
2006-11-03 16:18:32 +01:00
unknown
16a671c021 Don't warn about "Found non pid file" for elements that are not files. 2006-11-03 15:26:42 +01:00
unknown
7bc532ae63 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
include/mysql_h.ic:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/my_lock.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use remote
include/Makefile.am:
  Manual merge
2006-11-03 14:40:52 +01:00
unknown
94776f1e39 Merge neptunus.(none):/home/msvensson/mysql/my41-m-stress
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
2006-11-03 12:58:45 +01:00
unknown
d7d0568236 Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well.
mysql-test/lib/mtr_misc.pl:
  Update comments
mysql-test/mysql-test-run.pl:
  Also need to look in "$glob_basedir/bin"
2006-11-03 12:32:05 +01:00
unknown
39e394395b Fix typo, Add "s" to format specifier for --stress-init-file 2006-11-03 11:42:22 +01:00
unknown
6bc475c5e3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-02 20:43:48 -05:00
unknown
a04d382796 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-02 15:16:33 -05:00
unknown
6afaa993e4 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-02 15:14:50 -05:00
unknown
636efc9003 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config


mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-02 15:11:22 -05:00
unknown
75bde223c4 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my41-mtr_vs_config
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  manual merge
2006-11-02 15:09:23 -05:00
unknown
8e6b1e3849 Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
Visual Studio builds each configuration in a different sub-directory.  Only the sub-
directories for release and debug are currently searched.


mysql-test/lib/mtr_misc.pl:
  Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
  - Added usage comments.
mysql-test/mysql-test-run.pl:
  Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
  - Moved Initial_Setup function to the command_line_setup function.
  - Defined new argument vs-config which can be used to inidicate the VS Configuration
  used to create the test executables. Argument can also be controlled with
  MTR_VS_CONFIG environment variable.
2006-11-02 15:05:20 -05:00
unknown
dfc8d06c18 Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_lock.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2006-11-02 08:47:21 +01:00
unknown
6a7ce1eb3b Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/rename.test:
  Manual mereg
2006-10-31 19:08:30 +01:00
unknown
aa8c830d9b Improve the reading of .pid files from var/run
- Only read *.pid
 - Only allow it to contain a number 


mysql-test/lib/mtr_io.pl:
  Check that the value read from pidfile is a valid number consisting only of digits
mysql-test/lib/mtr_process.pl:
  Only process .pid files in var/run dir and print a warning if other files are found there.
2006-10-31 19:02:33 +01:00
unknown
67dcfc3e87 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-10-25 16:52:27 +02:00
unknown
060f4196af Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-10-25 16:51:32 +02:00
unknown
5decebc5f3 Skip innodb test if mysqld doesn't have innodb support 2006-10-25 16:50:06 +02:00
unknown
9d94d91b40 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-10-25 02:25:03 +02:00
unknown
0a7a2b8f66 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-24 23:40:11 +02:00
unknown
4da54b4769 Adapt mysql-test-run.pl to mysqld in 5.1 using "mixed" binlog format by default 2006-10-24 23:39:46 +02:00
unknown
2d6a5f29c9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_class.cc:
  Auto merged
2006-10-19 23:27:22 +02:00
unknown
801368e755 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-19 20:34:28 +02:00
unknown
fc9cf7f45d Adapt to running from "binary dist"
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd


mysql-test/lib/mtr_misc.pl:
  Add function mtr_exe_maybe_exists
mysql-test/mysql-test-run.pl:
  Adapt to running from binary dist
  Add function mtr_exe_maybe_exists to look for binaries that is optional
  Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
2006-10-19 20:33:32 +02:00
unknown
9ee7178742 Fix problem running rpl_timezone on powermacg5, it was not popular to set TZ to "" so now it's set
to a value wich is not our default
2006-10-19 20:29:33 +02:00
unknown
1641593047 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
2006-10-18 18:45:00 +02:00
unknown
1355b0dc9b Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_report.pl:
  Auto merged
2006-10-18 18:02:07 +02:00
unknown
ea80f1a07a Put the printf of failed ratio on itäs only line, printf was tricked
into thinking the escaped % + w was a format specifier
2006-10-18 17:58:26 +02:00
unknown
90b23da3e2 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-18 17:16:53 +02:00
unknown
3c0a746633 Don't stop the time in mtr_timer_timeout, that will be done after testcase or when program exit 2006-10-18 17:16:08 +02:00
unknown
62309faa1d Remove some junk 2006-10-18 16:40:22 +02:00
unknown
fca9224bde Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_timer.pl:
  Auto merged
2006-10-18 16:31:38 +02:00
unknown
b860c4dbf5 Fix bug where a timer was stopped by calling mtr_timer_stop with a "timer" instead of it's name 2006-10-18 16:30:51 +02:00
unknown
9e26ab430d Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-18 13:25:06 +02:00
unknown
85cfdc5bcc Make --with-ndbcluster only be valid together with --bench
Improve code that detects if ndb shuold be installed
Remove call to stop_all_servers after install db, if any servers are still running 
and need to be stopped they will be stopped atuomatically


mysql-test/lib/mtr_cases.pl:
  All tests that have "source include/have_ndb.inc" are ndb tests
mysql-test/mysql-test-run.pl:
  Set --with-ndbcluster to only be valid together with --bench
  Rename opt_ndbcluster_supported to glob_ndbcluster_supported it's not an option
  Fix warnings
2006-10-18 13:24:06 +02:00
unknown
98fd299133 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/deleted/.del-collapsed:
  auto-union
BitKeeper/etc/collapsed:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_dbug.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/time.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge.
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/func_time.test:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
sql/sql_view.cc:
  Manual merge.
2006-10-17 12:00:36 -04:00
unknown
7688f9aa27 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-17 11:31:56 +02:00
unknown
40ac968926 Remove warnings
Set comment properly before calling mtr_report_test failed and report_failure_restart 


mysql-test/lib/mtr_report.pl:
  Remove warnings
  No need to check ndb installed ok here, when that is detected comment is set to indicate the problem
2006-10-17 10:31:06 +02:00
unknown
b8177c3ead Cleanup mtr_timer
Add verbose printouts making it possible to see what happens.
Make it an error if trying to stop a non existing timer
Print warning if fork fails.
2006-10-15 15:38:56 +02:00
unknown
b2bf4843c7 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_dbug.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge, test already there
mysql-test/t/innodb_mysql.test:
  Manual merge
2006-10-14 19:55:06 +02:00
unknown
ad4d813024 No need to continue in 'mtr_report_test_failed' after timeout detected, return immediately after 2006-10-14 17:14:03 +02:00
unknown
b35617cdba Improve the function that parses test files looking for what features it uses
Now also detects "source nnnn;" command, previous version only detected
"--source"
2006-10-13 11:05:46 +02:00
unknown
450eab19a3 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
sql-common/client.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use remote
2006-10-12 11:39:41 +02:00
unknown
4d45abc5d2 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
sql-common/client.c:
  Auto merged
2006-10-12 11:30:07 +02:00
unknown
00f420db13 Fix unhandled exception in mysql-test-run.pl, creating a dir that already exist
mysql-test/lib/mtr_process.pl:
  Remove junk code/comments
  Moved the creation of var/log out of function mtr_kill_leftovers
mysql-test/mysql-test-run.pl:
  Rename 'kill_running_server' to more appropriate name 'kill_running_servers'
  If no var/log dir exists when mtr_kill_leftovers is started it should be created
  Remove "unless" syntax, too perlish
  Fix typo
2006-10-12 11:29:13 +02:00
unknown
4b134f4d5c Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/deleted/.del-bdb-alter-table-2-master.opt:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-10-11 14:57:59 +02:00
unknown
88820b4146 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-11 14:54:36 +02:00
unknown
a008137880 Improve restart logic all code to detect restart is now in the functions
'run_testcase_need_master/slave_restart'
Remove the faulty qw
Only look for mysql_fix_privilege_tables if not windows


mysql-test/lib/mtr_cases.pl:
  Move all code to determine when to restart into 'run_testcase_need_master/slave_restart' 
  Add possibility to wite --force-restart in -master.opt file, this will force a restart and
  since master is not started with any special options there is no need to restart
  again afterwards.
mysql-test/mysql-test-run.pl:
  Remove the qw surrounding ENV{'LD_LIBRARY_PATH'}
  Only look for the sh script mysql_fix_privileges when not on windows
  Remove warnings about using unitialized variables
  Improve the restart logic, eall code to determine when to restart is
  now in run_testcase_need_master_restart and run_testcase_need_slave_restart
mysql-test/t/bdb-alter-table-2-master.opt:
  Use --force-restart
mysql-test/t/not_embedded_server-master.opt:
  Use --force-restart
2006-10-11 14:50:19 +02:00
unknown
2cf295764d Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-08 17:50:40 +02:00
unknown
ec90a4dcba Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-check-testcase.test:
  Delete: mysql-test/include/check-testcase.test
2006-10-08 17:48:56 +02:00
unknown
eab94fd0ba Print names of testcases that failed check_testcase, this makes it easier
to run the whole testcase to find wich testcases need to be checked more carefully
and the just "copy and paste" the suspicious test case names to 
a new mysql-test-run.pl command. 


mysql-test/mysql-test-run.pl:
  Mark test cases that fails "check_testcase"
  Make run_check_testcase return  value indicating if check failed
mysql-test/include/check-testcase.test:
  New BitKeeper file ``mysql-test/include/check-testcase.test''
2006-10-08 17:48:01 +02:00
unknown
127e401185 Move list of mysqls src dirs into lib/mtr_gcov.pl as it's only used from there 2006-10-08 17:05:17 +02:00
unknown
e1e632c4e0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-10-07 19:14:30 +02:00
unknown
a3a0510458 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-10-07 19:12:10 +02:00
unknown
5adb9347ea Improve sort algorithm for reorder, all test with smae name except for ending digit should be run after each other.
Example of that is ndb_autodiscover[1-3]
2006-10-07 19:11:37 +02:00
unknown
d3cc303729 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-06 17:18:21 +02:00
unknown
e96241a4a2 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
2006-10-06 17:17:18 +02:00
unknown
64329b16ec Add error handling of failure to start server to "run_testcase_start_servers"
mysql-test/lib/mtr_report.pl:
  Use tinfo's comment as primary place to look for error message
2006-10-06 17:15:26 +02:00
unknown
62e2b91408 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/deleted/.del-mtr_im.pl:
  Auto merged
BitKeeper/deleted/.del-mtr_stress.pl:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-10-06 16:29:10 +02:00
unknown
89d0432dd9 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-06 16:27:57 +02:00
unknown
e16d985171 Fix problem with specifying vardir, mysql_version_id was not yet available when vardir arguments is checked
Move the code to look for exe_mysqld earlier => to initial_setup
Fix warnings detected by running with "diagnostics"
Remove unused option "opt_result_ext"
Init "path_ndb_examples_dir"


mysql-test/lib/mtr_cases.pl:
  Set default number of slave to 0
  Remove unused/uninitialized "$opt_result_ext"
mysql-test/lib/mtr_report.pl:
  Remove unused/uninitialized "$opt_result_ext"
2006-10-06 16:26:17 +02:00
unknown
60cd16dfb9 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools


mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-10-06 11:56:23 +02:00
unknown
64ad6bfbf0 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-10-06 11:50:04 +02:00
unknown
4d56a43cb0 Only print thesort order debug printout if using script-debug 2006-10-06 11:49:31 +02:00
unknown
e8ddf2baf8 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools


mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-10-06 11:30:27 +02:00
unknown
80c96d859f Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-06 11:24:31 +02:00
unknown
9350dbc4f9 Improve 'run_testcase_need_master_restart' to require restart if master is not already started
Improve 'run_testcase_need_slave_restart' to detect if a slave restart really is necessary. 
So far all rpl test requires a slave restart, but for all other tests it can be skipped
Improve the sort order used by --reorder


mysql-test/lib/mtr_cases.pl:
  Improve the sort order used by reorder
mysql-test/mysql-test-run.pl:
  Improve 'run_testcase_need_master_restart' to require restart if master is not already started
  Improve 'run_testcase_need_slave_restart' to detect if a slave restart really is necessary. 
  So far all rpl test requires a slave restart, but for all other tests it can be skipped
2006-10-06 11:23:19 +02:00
unknown
f1d53222a2 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-05 22:07:34 +02:00
unknown
5bdc88183a Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-05 22:06:51 +02:00
unknown
c3997a6640 Open input file with "<" not ">>" 2006-10-05 22:06:29 +02:00
unknown
e8fae25e6b Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools


BitKeeper/deleted/.del-mtr_stress.pl:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
BitKeeper/deleted/.del-rpl000018.result:
  Auto merged
BitKeeper/deleted/.del-rpl000018.test:
  Auto merged
BitKeeper/deleted/.del-rpl_chain_temp_table.result:
  Auto merged
BitKeeper/deleted/.del-rpl_chain_temp_table.test:
  Auto merged
BitKeeper/deleted/.del-rpl_failsafe.result:
  Auto merged
BitKeeper/deleted/.del-rpl_failsafe.test:
  Auto merged
BitKeeper/deleted/.del-rpl_heap.result:
  Auto merged
BitKeeper/deleted/.del-rpl_heap.test:
  Auto merged
mysql-test/include/have_ndb.inc:
  Auto merged
mysql-test/include/master-slave.inc:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/r/flush_block_commit.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/handler_myisam.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/query_cache_notembedded.result:
  Auto merged
mysql-test/r/rpl_err_ignoredtable.result:
  Auto merged
mysql-test/r/rpl_master_pos_wait.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/r/sp-threads.result:
  Auto merged
mysql-test/r/sp_notembedded.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/synchronization.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/ps_grant.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_trunc_temp.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp_notembedded.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  SCCS merged
2006-10-04 16:35:40 +02:00
unknown
5a39b93ec0 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
BitKeeper/deleted/.del-mtr_stress.pl:
  Delete: mysql-test/lib/mtr_stress.pl
mysql-test/include/have_ndb.inc:
  SCCS merged
2006-10-04 16:30:56 +02:00
unknown
dccc6b10c3 Backport from 5.1
-Add support for detecting version and features from mysqld binary
 - Autodetect netware
 - Disable some features not available below 5.0
 - Cleanup executable_setup to look for one executable at a time, only llok for the ones that are needed based on the selected testcases and settings


mysql-test/lib/mtr_cases.pl:
  Backport from 5.1
mysql-test/lib/mtr_io.pl:
  Backport from 5.1
  Add new function mtr_appendfile_to_file
mysql-test/lib/mtr_misc.pl:
  Backport from 5.1
mysql-test/lib/mtr_process.pl:
  Backport from 5.1
mysql-test/lib/mtr_report.pl:
  Backport from 5.1
mysql-test/mysql-test-run.pl:
  Add support for detecting version and features from mysqld binary
  Autodetect netware
  Disable some features not available below 5.0
  Cleanup executable_setup to look for one executable at a time, only llok for the ones that are needed based on the selected testcases and settings
mysql-test/r/mysqltest.result:
  Update result
mysql-test/lib/mtr_im.pl:
  New BitKeeper file ``mysql-test/lib/mtr_im.pl''
mysql-test/lib/mtr_stress.pl:
  New BitKeeper file ``mysql-test/lib/mtr_stress.pl''
2006-10-04 12:47:32 +02:00
unknown
e634094680 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-10-03 13:27:48 +02:00
unknown
5871cf09a9 5.0-rt -> 5.1-rt after-merge fixes.
mysql-test/lib/mtr_im.pl:
  Fix merge.
mysql-test/lib/mtr_process.pl:
  Fix merge.
mysql-test/r/im_daemon_life_cycle.result:
  Fix merge.
mysql-test/t/im_daemon_life_cycle.imtest:
  Fix merge.
2006-09-28 15:40:23 +04:00
unknown
60928825f5 Merge bk-internal:/home/bk/mysql-5.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-28 13:28:18 +02:00
unknown
eaf199de22 Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
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.
2006-09-28 15:10:18 +04:00
unknown
17e3f89975 Return from function 'collect_one_test_case' as sson it's detected that testcase should be skipped 2006-09-25 20:28:40 +02:00
unknown
7742d05931 Merge bk-internal:/home/bk/mysql-5.1-maint
into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-22 21:00:23 +02:00
unknown
c84223043b Immediately skip tests that need innodb if mysqld does not support it
mysql-test/lib/mtr_cases.pl:
  immediately skip tests that need innodb if mysqld does not support it
mysql-test/mysql-test-run.pl:
  Check if innodb is supported
2006-09-22 20:58:16 +02:00
unknown
ae2603c1c7 Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-19 17:47:53 +02:00
unknown
7fef817a99 Fix warnings in mysql-test-run.pl
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
2006-09-19 17:45:27 +02:00
unknown
8ed01c83d7 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
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
2006-09-19 17:08:07 +02:00
unknown
ea1a9e41a6 Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed.
The pid file will be removed later when var/ directory is recreated.
2006-09-19 16:48:01 +02:00
unknown
0dc08b9040 Fix warnings in mysql-test-run.pl
mysql-test/lib/mtr_stress.pl:
  Remove duplicate definition of variable
mysql-test/mysql-test-run.pl:
  Fix spelling error
  Fix warning about uninitialised warning
2006-09-19 16:43:42 +02:00
unknown
e701346dcf This is another patch for test suite to make IM tests work smoothly.
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.
2006-09-08 16:19:19 +04:00
unknown
c1c4d956c1 Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-tree
into  alik.:/mnt/raid/alik/MySQL/devel/5.0-rt


mysql-test/lib/mtr_process.pl:
  Auto merged
2006-09-05 17:42:59 +04:00