From: Bjorn Munch Date: December 9 2010 1:41pm Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2957) Bug#58608 List-Archive: http://lists.mysql.com/commits/126421 X-Bug: 58608 Message-Id: <201012091341.oB9Df6qk003486@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1531637581==" --===============1531637581== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/bm136801/my/rcvcp-51/ based on revid:bjorn.munch@stripped 2957 Bjorn Munch 2010-12-09 Bug #58608 mysqltestrun --help incongruences Fixed some errors Added note about 'no' prefix to options See also follow-up comment to bug report modified: mysql-test/mysql-test-run.pl === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2010-11-24 12:51:45 +0000 +++ b/mysql-test/mysql-test-run.pl 2010-12-09 13:40:36 +0000 @@ -863,7 +863,7 @@ sub command_line_setup { my $opt_list_options; # Read the command line options - # Note: Keep list, and the order, in sync with usage at end of this file + # Note: Keep list in sync with usage at end of this file Getopt::Long::Configure("pass_through"); my %options=( # Control what engine/variation to run @@ -898,6 +898,7 @@ sub command_line_setup { 'combination=s' => \@opt_combinations, 'skip-combinations' => \&collect_option, 'experimental=s' => \@opt_experimentals, + # skip-im is deprecated and silently ignored 'skip-im' => \&ignore_option, # Specify ports @@ -990,6 +991,7 @@ sub command_line_setup { 'max-connections=i' => \$opt_max_connections, 'help|h' => \$opt_usage, + # list-options is internal, not listed in help 'list-options' => \$opt_list_options, ); @@ -5460,7 +5462,7 @@ Options to control what engine/variation defaults-file= Use fixed config template for all tests - defaults_extra_file= Extra config template to add to + defaults-extra-file= Extra config template to add to all generated configs combination= Use at least twice to run tests with specified options to mysqld @@ -5550,7 +5552,7 @@ Options for debugging the product test(s) manual-ddd Let user manually start mysqld in ddd, before running test(s) - strace-client=[path] Create strace output for mysqltest client, optionally + strace-client[=path] Create strace output for mysqltest client, optionally specifying name and path to the trace program to use. Example: $0 --strace-client=ktrace max-save-core Limit the number of core files saved (to avoid filling @@ -5583,7 +5585,7 @@ Options for valgrind Misc options user=USER User for connecting to mysqld(default: $opt_user) comment=STR Write STR to the output - notimer Don't show test case execution time + timer Show test case execution time. verbose More verbose output(use multiple times for even more) verbose-restart Write when and why servers are restarted start Only initialize and start the servers, using the @@ -5623,6 +5625,7 @@ Misc options actions. Disable facility with NUM=0. gcov Collect coverage information after the test. The result is a gcov file per source and header file. + gprof Collect profiling information using gprof. experimental= Refer to list of tests considered experimental; failures will be marked exp-fail instead of fail. report-features First run a "test" that reports mysql features @@ -5631,6 +5634,10 @@ Misc options *previous* test started max-connections=N Max number of open connection to server in mysqltest +Some options that control enabling a feature for normal test runs, +can be turned off by prepending 'no' to the option, e.g. --notimer. +This applies to reorder, timer, check-testcases and warnings. + HERE exit(1); --===============1531637581== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/bjorn.munch@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@stripped # target_branch: file:///home/bm136801/my/rcvcp-51/ # testament_sha1: 6969ec423248c2a8d885335c41c965246d5a8015 # timestamp: 2010-12-09 14:41:06 +0100 # base_revision_id: bjorn.munch@stripped\ # m3kf02cbt38vw9j3 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdRyGuMAAhZfgGAyWOf/93sL DAq////wUAUust3uY9b22uPe7avdajCUQgDRMEmanoyBTMpo9T1NA0xNNMg1NE01PNTBEJtTajI8 ppoAaAGQAJIgIJkMUnp6hMNT1Go9RhMAhgaDEhDRMSep6mQYTIeoxNADQAaAkkJpT2pkanpBptTa jR6mmQAAAAWwkBUU3YHh7OIenTxhv7xXzon816HNNb3oheoemJBFjmD80qwOdJhBPCLPqHcgIbKl b82cfnYiUi/1IEz5QjlXZDdBeqrAtqthY5Ryka3furZxp4W7cl24jIXYZ8V2+DKGr3UORSu5y17t TowVEMgs/glTXfnimtyIpkkUL54NpgsKaZNlJg/MbRM8jMUjN/62VFrWX62cUuPRJPchJBE+kFYF S+W+ma1sI0wEN4mq6THnNNDwjTqrNEcSZUbMZCimWvLTJAA7gJtV502uAF3ExLKKZY7g6hzBxBQJ yB0TUUqqk4CtkqhNrATri6goCOWZw+3fJKajKCCgg073EsQmFmXD3j7t7BQV56ltFJs4+W2BWTjY 8hXSt1TTWIt0uljMgSdLVQHklTWDLC3RBWoaTTRMnsJO8Ta8oibgdWmyJmukR6J1aa4nhtSSs9SB V0ceCPEamUmvo4prA3vJjrq524mTUOmUYofrMizTGMRampW67dWD3vrhgVqVMTm7Q1mogN4NXq1M qN2aGYqZGLc4oIYhtvMxu7fKDRydUMsVaV55k4+PmHt4HO+USe9Dg8XWwNVUqgdm8LAxwDQqoKfh VGqAYAT8QpuFcroyi27FyWb1odRHYPE9C379m3CLuyJ3Qji0rHHMRXQsgIgdEs/Lmbp5cM7VFPXt /DeHaiErVUVV8eR5VwUEU5CqWlpCNb3DTMnG0LOGxjPHljRPOOdEhpLyAbp/002rbOK42o7JFm2b 39pKkSPdx38TPpJnVzc+E2B1mArP1ajKki9xdxhqRDrt35imyr5ixzarc6VkuajsEQcsaJYvYkP6 tRIbAsMW6YnOiHpLE1dnI0KtEhkKtRxTx8ZR5PBo3EsvRhwvf0+DrJ+x2+MyY2JEMyu1YiTWYCib rsYfhB4VXgkkqeAc66c4Sqm8KbAp5V19Q+9GjVIlfLnnOzKTfNIsExdrLTbc8izYISA4hKkERXHp Izz0VbCaxAIgHAPaFI1rMX5CSMwSnYjlCojCu3HaYibazKQ03WPjKL0cTmsFa8GkatIr36xE2Mjf wyQ5swOXwnj+pcvJpmIiZeUws8U1/WqdBqY7B0bmrwoKYawpZJLIr3emF0cqRgoSz75FXeE6fXdV /poO5IDUdx380jRlIiZytCWi/kZi/OEwYnBAwkkhqWJm6YEpR0Vut53wtuH2IhFuiygjVO/FDD1y ddTD/I7xRIxKjUkXd1lTMVlWGTjAD0iCcbd44pmdRzwnoZIshAcH9pWqiJmuhuP9Oi9SorrUWMDQ dOtO5hfRvikTrUzDbLkJE2thORajFxYqYRNaiNpIpBRQOCwEjyIUgPetmybjkZ1fmqyzoyyTFVTy hI6MkaWPWSp0RiCniRbVsCB1TQE7A4RxgzAQJOCdqctblajB2nycv89EA9lbrE032cilRm305mLo qk+huAOGCkmVNsKr6QvV0y0AOdE9enE+70Wi4Gs0JIBVASkFEhDLDbuGHfPsfRMtVOBuKSKSGaLQ sMqPvZtBk422kE1myCfAvlwRbMV4OpbCBAZXWwV1lZmk/DbypykHj3JD5W5l5nloPeLE94o71wR8 FQ/tWmN09pGNzHNqeS6LViYKa7uU4m4Ze159BI1m/4u5IpwoSGo5DXGA --===============1531637581==--