1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Commit Graph

40 Commits

Author SHA1 Message Date
unknown
79743f7ba7 Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my51-mtr_reorder
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-09-01 21:58:07 +02:00
unknown
20bc595b6d Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my50-mtr_reorder
into  maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my51-mtr_reorder


mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-09-01 21:54:34 +02:00
unknown
9e145670c4 mtr_cases.pl:
Provide a more extensible, easier-to-change way of reordering
  test cases.


mysql-test/lib/mtr_cases.pl:
  Provide a more extensible, easier-to-change way of reordering
  test cases.
2006-09-01 21:53:23 +02:00
unknown
edc0e9fba8 Use "--skip-innodb" if running with testcases that does not need innodb
Decreases test time when running a selected number of tests


mysql-test/lib/mtr_cases.pl:
  Remove fixme, it's fiexd now
mysql-test/mysql-test-run.pl:
  Use "--skip-innodb" if running with testcases that does not need innodb
2006-09-01 10:01:47 +02:00
unknown
690101ad88 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)


include/my_base.h:
  Auto merged
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/lib/mtr_report.pl:
  merge of mysql-5.1 -> mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
  merge of mysql-5.1 -> mysql-5.1-new-maint
2006-07-15 00:33:24 -06:00
unknown
81bb604c63 Behaviour change of mysql-test-run.pl:
by default we never run disabled tests (even if they're
explicitely listed on the command-line). We add an option --enable-disabled
which will run tests even though they are disabled, and will print, for each
such test, the comment explaining why it was disabled.
The reason for the change is when you want to run "all tests which are about
NDB" for example: mysql-test-run.pl t/*ndb*.test used to run some disabled
NDB tests, causing failures, causing investigations.
Code amended and approved by Kent.


mysql-test/lib/mtr_cases.pl:
  always detect if a test is listed as disabled, and read the comment why is is.
  If it is listed, don't run the test, except if
  --enable-disabled was given, then mark the test as to-run-even-
  though-it-is-listed-as-disabled.
mysql-test/lib/mtr_report.pl:
  Report tests which will run though they are listed as disabled
  (does something only if --enable-disabled).
mysql-test/mysql-test-run.pl:
  New behaviour: by default we never run disabled tests (even if they're
  explicitely listed on the command-line). We add an option --enable-disabled
  which will run tests even though they are disabled, and will print, for each
  such test, the comment explaining why it was disabled.
2006-07-06 17:40:36 +02:00
unknown
59d3c6f4c7 Update function 'mtr_options_from_file' after review (and some help) 2006-06-14 22:15:21 +02:00
unknown
edec3302c8 Cleanup ndb options 2006-06-14 21:45:15 +02:00
unknown
6e0e266e47 Update explanation why test was skipped 2006-06-14 16:03:27 +02:00
unknown
9c843af8b8 Skip tests that need debug binaries only if binaries are _not_ debug compiled 2006-06-12 09:00:33 +02:00
unknown
4dc5ee744e Only process lines that start with -- 2006-06-12 00:05:02 +02:00
unknown
bd4c449ff5 Fix warnings
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
2006-06-11 23:13:32 +02:00
unknown
36495cba3b Add more checks to determine if test can be skipped becuase the feature it uses are not supported.
Check for big-test, ndb-extra, require_manager and binlog format row/stmt
2006-06-11 15:49:34 +02:00
unknown
f29fbcde08 Prepare for selective restart of slaves
Add comment why test is skipped


mysql-test/lib/mtr_cases.pl:
  Add comments why tets is skipped
  Disable the use of --skip-innodb if test does not need it
mysql-test/lib/mtr_report.pl:
  Print commment why test was skipped
2006-06-11 10:10:55 +02:00
unknown
20091c5b86 Save "master_opt" in master so it can be checked later to see if it's the same as the test that are about to run uses the same.
mysql-test/lib/mtr_cases.pl:
  Move setting of --skip-innodb out of recursive loop
2006-05-18 19:52:43 +02:00
unknown
46d60e77c3 Parse test files to find out if it needs innodb or not, mark test as 'innodb_test' if it does and add "--skip-innodb" to master_opts if it does not.
mysql-test/lib/mtr_cases.pl:
  Parse test files to find out if it needs innodb or not
2006-05-17 23:54:48 +02:00
unknown
34c086526c Fix for bug #18979, bad RE in mysql-test-run.pl
mysql-test/lib/mtr_cases.pl:
  Fixed the RE so that backtracking will not occur.
2006-04-17 19:43:19 -07:00
unknown
a264a79eb7 Merge
mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-03-11 01:53:30 +01:00
unknown
99b9f7a45b Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_ddl.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/skip_grants.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Manually merged.
sql/sp.cc:
  Manually merged.
sql/sql_yacc.yy:
  Manually merged.
2006-03-09 20:41:21 +03:00
unknown
0e6c94e1ea Merge
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
2006-03-09 00:40:52 +01:00
unknown
a3208c0f1f mysql-test-run.pl, mtr_cases.pl
- 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
2006-03-08 19:15:56 +01:00
unknown
acb53e4ec4 BUG#17574 Detect cluster start failure and "fail" ndb_* tests
- 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.
2006-03-08 16:57:42 +01:00
unknown
4070ab9953 Merge shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574
into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Manual merge of bug#17574 from 5.0 -> 5.1
2006-03-07 20:03:01 +01:00
unknown
329264140a Bug#17574 Detect cluster start failure and "fail" ndb_* tests
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
2006-03-07 19:44:58 +01:00
unknown
11ba97ebf3 Merge
mysql-test/lib/mtr_cases.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
2006-02-12 04:48:52 +01:00
unknown
4e8f2a12bc Merge
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
2006-02-12 04:33:50 +01:00
unknown
0f3d881320 spatial.cc:
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"
2006-02-12 04:13:24 +01:00
unknown
406d0ea5ac Start cluster only for testcases that really needs it and stop it when
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.
2006-02-09 09:40:48 +01:00
unknown
456d7b3c05 harmonized mysql-test-run.sh and .pl
+ added current test printout to error file


mysql-test/lib/mtr_cases.pl:
  harmonized mysql-test-run.sh and .pl
2006-02-06 15:42:26 +01:00
unknown
0f30b9d7fc updated mysql-test-run.pl to adjust to ndb replication testing
BitKeeper/etc/ignore:
  Added libmysqld/ha_ndbcluster_binlog.cc libmysqld/rpl_injector.cc to the ignore list
2006-01-13 03:13:58 +01:00
unknown
cced6ea2e2 mysql-test-run.pl:
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
2005-10-16 20:51:19 +02:00
unknown
46d8163b1b WL#2789 "Instance Manager: test using mysql-test-run testing framework"
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.
2005-10-01 01:12:14 +04:00
unknown
d99d05e987 Implement WL#2789 "Instance Manager: test using mysql-test-run testing framework"
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.
2005-08-29 22:28:42 +04:00
unknown
ee793d030e mtr_process.pl:
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
2005-08-17 01:18:13 +02:00
unknown
ce5f68cfa0 mtr_cases.pl:
Added support for the disabled.def file


mysql-test/lib/mtr_cases.pl:
  Added support for the disabled.def file
2005-07-07 18:41:22 +02:00
unknown
d73327e199 mtr_cases.pl:
Bug#11466: Script can now get test case name
  from test case file path on command line
mysql-test-run.pl:
  Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mtr_cases.pl:
  Don't set --default-time-zone if opt file sets it
  Restart the server if time zone is given in opt file
mysql-test-run.pl:
  Don't remove symlink to "var" directory in cleanup
  Removed duplicate/unessesary options to mysqld


mysql-test/mysql-test-run.pl:
  Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mysql-test/lib/mtr_cases.pl:
  Bug#11466: Script can now get test case name
  from test case file path on command line
2005-06-20 21:37:39 +02:00
unknown
f35c177a2a mysql-test-run.pl:
Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files
mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test-run.pl:
  Set environment variable MYSQL_SHOW, to be used in test cases


mysql-test/lib/mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test/mysql-test-run.pl:
  Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files
2005-06-19 20:06:27 +02:00
unknown
4cc8730d15 mtr_process.pl:
Added a sleep for 5 seconds when shuting down,
  work around for strange problem with server restarts
mtr_cases.pl:
  Set default time zone as opt to mysqld
mysql-test-run.pl:
  Enabled --mysqld=<flags> to work
  Put some Windows path names into environment,
  to be used in --replace_result
mysql-test-run.sh:
  Make shell script tolerant to Windows change in test cases


mysql-test/mysql-test-run.sh:
  Make shell script tolerant to Windows change in test cases
mysql-test/mysql-test-run.pl:
  Enabled --mysqld=<flags> to work
  Put some Windows path names into environment,
  to be used in --replace_result
mysql-test/lib/mtr_cases.pl:
  Set default time zone as opt to mysqld
mysql-test/lib/mtr_process.pl:
  Added a sleep for 5 seconds when shuting down,
  work around for strange problem with server restarts
2005-06-10 21:29:37 +02:00
unknown
a94a62cefb mtr_report.pl:
Made --timer work
mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log


mysql-test/mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log
mysql-test/lib/mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test/lib/mtr_report.pl:
  Made --timer work
2005-03-21 16:01:39 +01:00
unknown
c2e9e15e9f mtr_cases.pl:
new file
2005-02-03 21:50:56 +01:00