1
0
mirror of https://github.com/MariaDB/server.git synced 2025-10-28 17:15:19 +03:00
Commit Graph

101 Commits

Author SHA1 Message Date
Bjorn Munch
d7d3c56aee merge from 5.1-mtr 2009-05-25 22:58:31 +02:00
Kristofer Pettersson
baeac87623 Bug#19027 MySQL 5.0 starts even with Fatal InnoDB errors
Fix bug in mtr_cases.pm script visible only when InnoDB isn't configured.

mysql-test/lib/mtr_cases.pm:
  If InnoDB isn't configured the help texts won't show the "innodb" option and mysqld_variables will not contain any "innodb" entry.
2009-05-17 22:16:21 +02:00
Kristofer Pettersson
afee63222a Bug#19027 MySQL 5.0 starts even with Fatal InnoDB errors
It is not possible to prevent the server from starting if a mandatory
built-in plugin fails to start. This can in some cases lead to data
corruption when the old table name space suddenly is used by a different
storage engine.

A boolean command line option in the form of --foobar is automatically
created for every existing plugin "foobar". By changing this command line
option from a boolean to a tristate { OFF, ON, FORCE } it is possible to
specify the plugin loading policy for each plugin.

The behavior is specified as follows:
   OFF   = Disable the plugin and start the server
   ON    = Enable the plugin and start the server even if an error occurrs
           during plugin initialization.
   FORCE = Enable the plugin but don't start the server if an error occurrs
           during plugin initialization.


mysql-test/lib/mtr_cases.pm:
  * Changed --<pluginname> from a boolean to a tristate.
mysys/my_getopt.c:
  * Changed --<pluginname> from boolean to tristate. Optional arguments
    must still work for tristates. It is praxis that disable means value 0
    and enable is value 1. Since plugin name is the only tristate with
    optional arguments this principle will still hold.
sql/sql_plugin.cc:
  * Changed --<pluginname> option from a boolean type to a tristate.
    - FORCE will now terminate the server if the plugin fails to
      initialize properly.
  * Refactored prototypes for test_plugin_options() and construct_options()
    to get rid of the 'enable' value pointer.
  * Cleaned up code related to option name constructing.
  * Added documentation
sql/sql_plugin.h:
  * Introduced new member to st_plugin_int structure.
2009-05-14 14:03:33 +02:00
Bjorn Munch
2f9155296d Bug #42988 MTR2's --help output does not document --parallel
Several options were not documented
Added missing options and removed a few
Fixed use of --skip-combinations
2009-05-12 14:53:46 +02:00
Bjorn Munch
fd6beee8d7 Bug #42807 MTR: './mtr somesuite.sometest' fails if somesuite is not in DEFAULT_SUITES
If suite specified as part of test name, collect from that suite too.
2009-03-27 11:25:24 +01:00
unknown
30f4155023 Remove redundant code, probably bad automerge 2009-03-20 15:39:37 +01:00
Michael Widenius
945fa0d913 Merge with mysql-maria tree
mysql-test/t/variables.test:
  Reset delay_key_write, otherwise maria.maria test may fail
sql/set_var.cc:
  Reset ha_open_options if one resets the delay_key_write variable.
  Before there was no way to reset it without restarting mysqld, which caused some tests to fail
2009-02-19 11:01:25 +02:00
Michael Widenius
a8fdaa6f2c Merge with base MySQL 5.1
Contains fixes for test cases
Changed release tag to beta

configure.in:
  change release tag to beta
2009-02-15 12:58:34 +02:00
Guilhem Bichot
704b4845aa merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.

mysys/thr_mutex.c:
  adding DBUG_PRINT here, so that we can locate where the warning is issued.
2009-02-12 15:08:56 +01:00
Magnus Svensson
9c76ec9323 Bug#39972 mysql-test-run.pl: Confusing error message under special conditions
- Fix problem with for example ./mtr --timer, caused by new version of "Getopt::Long"
 - Evaluating the "$opt" variable as a string, returns the name of the parameter
   to be modified instead of "Getopt::Long::Callback" which is the class name
2009-01-21 11:17:16 +01:00
Andrei Elkin
fab8d1b460 Bug #40129 no-threads fails on pushbuild in 6.0-rpl, ps_stm_threadpool
The test reacted on the way how mtr orders arguments for the server
that are gathered from different source. It appeared that the opt-file
options were parsed before those that supplied to mtr via its command
line. In effect, the opt-file preferences got overriden by the command
line and some tests, like no-threads, were caught by surprise: a test
expects an option value that had been "hardcoded" into its opt-file
but gets another one.
This server options ordering problem exists on in the new rpl trees
mtr.  In option of the author of this patch, the opt-file shall be
considered as having the highest preference weight. The opt-file is
merely a part of the header of a test, namely a part that can not be
technically deployed along the test file.
It's unnatural for the test writer to provide both the opt file value
and a guard that guarantees the value will be set on in the run time.
It's logical to provide either one: the option and its value or the
guard.

Fixed with relocating parse of the opt file to be the last among
sources of the sever's options.

A side effect: fixing a small problem of resetting the suite options
at time the opt file starts parsing.

A side effect: main.log_bin_trust_function_creators_func is disabled to
be re-enabled with the fixes for bug#41003 will be merged from the main trees.


mysql-test/lib/mtr_cases.pm:
  Relocating parse of the opt file to be the last. This ensure the opt file is the last
  provider for the server options so that the opt-file options have the highest preference;
  fixing a separate issue of incorrect resetting the suite options for the server;
mysql-test/t/disabled.def:
  log_bin_trust_function_creators_func is disabled. Todo: to-reable when fixes for bug#41003
  will be merged from the main trees.
2008-12-12 23:51:44 +02:00
Serge Kozlov
3e0fb46142 Bug#39861:
1. mysqltest.cc - added flush to log file after each executed command in a testcase.
2. mtr shows 20 last lines from test case log file if timeout reached.
3. Optimizing the code by Magnus review.
4. It is partially fix bug#40150
2008-11-14 23:35:32 +03:00
Magnus Svensson
0456e23984 WL#4350 Fix --record and no .result file 2008-09-11 22:05:44 +02:00
Magnus Svensson
c11e919980 WL#4350 Options in my.cnf style config file should not start with -- 2008-09-05 15:31:09 +02:00
Magnus Svensson
31c7b018bd Merge 2008-08-04 22:25:45 +02:00
Magnus Svensson
4a38d4d765 Patch for combinations file using different --default-storage-engine= directives 2008-08-04 21:56:20 +02:00
Magnus Svensson
27e8584271 Bug #38181 Please print more debug info when tests fail 2008-08-04 21:54:44 +02:00
Magnus Svensson
d4fc0b76c6 Bug #33810 mysql-test-run can't find testcase if it is in a non-default testsuite 2008-08-01 16:08:51 +02:00
Magnus Svensson
264621b95b Check that the default-storage-engine used by test is a supported engine 2008-07-24 22:20:35 +02:00
Magnus Svensson
dbb0e6ad71 Merge parallel mtr 2008-06-19 10:10:37 +02:00
Magnus Svensson
f28f84842d Merge
mysql-test/lib/mtr_cases.pm:
  Merge in the new code for enabling federated for federated tests
2008-06-18 16:09:53 +02:00
unknown
ce1ca19593 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-maint2


mysql-test/lib/mtr_cases.pm:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge
2008-04-27 15:43:22 +02:00
unknown
255e30a5bc Merge bk-internal:/home/bk/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl


mysql-test/lib/mtr_cases.pm:
  Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
  Auto merged
2008-04-26 10:07:21 +02:00
unknown
34854fc2a5 WL#3754 Fix for mtr, added support personal configuration for test cases
mysql-test/lib/mtr_cases.pm:
  updated library
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result:
  result file for test case
2008-04-25 22:54:20 +04:00
unknown
ec19196c30 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-maint2


mysql-test/lib/mtr_cases.pm:
  Auto merged
2008-04-25 14:39:24 +02:00
unknown
70894cb9e4 Make it possible to specify test specifi config file as <testname>.cnf
mysql-test/suite/rpl/t/rpl_000015.cnf:
  Use test specific config file
mysql-test/suite/rpl/t/rpl_rotate_logs.cnf:
  Use test specific config file
2008-04-25 14:07:17 +02:00
unknown
dfdc6ae897 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-maint2


mysql-test/lib/mtr_cases.pm:
  Auto merged
2008-04-25 10:52:15 +02:00
unknown
32dcf68480 Only allow "suitename" to be used as a aptch if it has at least one
directory part
2008-04-25 10:51:11 +02:00
unknown
586d8cd454 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-maint2


mysql-test/lib/mtr_cases.pm:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_report.pm:
  Manual merge
2008-04-25 08:23:57 +02:00
unknown
d4a9ed4b50 Replace all - with - in $opt name 2008-04-24 14:15:15 +02:00
unknown
adc257481c Add support for running in parallel
mysql-test/lib/My/Options.pm:
  Allow $VAR as option
mysql-test/lib/My/SafeProcess.pm:
  Remove printouts
mysql-test/lib/My/Test.pm:
  New BitKeeper file ``mysql-test/lib/My/Test.pm''
2008-04-24 13:02:53 +02:00
unknown
3674c72d20 Improve 'collect_one_suite' so it looks in storage/*/mysql-test-suites by default
Also make it possible to specify a path to the suite, for example:
./mtr --suite=/some/path/to/suitedir 


mysql-test/lib/My/Find.pm:
  Extend 'my_find_paths' to glob path names
2008-04-22 12:40:48 +02:00
unknown
2c4ca51050 Check warnings in servers error log as part of test case
BitKeeper/deleted/.del-rpl_bug33931-slave.opt:
  Delete: mysql-test/suite/rpl/t/rpl_bug33931-slave.opt
mysql-test/include/default_mysqld.cnf:
  Set a default name for "log-bin"
mysql-test/mysql-test-run.pl:
  Check for warnings in mysqld error log files after each testcase,
  using SQL
mysql-test/lib/mtr_cases.pm:
  Make mtr_match into a perl module
mysql-test/lib/mtr_match.pm:
  Make mtr_match into a perl module
mysql-test/lib/mtr_report.pm:
  Make mtr_match into a perl module
  Print warnings if testcase failed from warnings
mysql-test/r/information_schema.result:
  Be more selective which databases and tables are select in the queries
mysql-test/r/mysql_upgrade.result:
  Update result, mysql_upgrade will check _all_ databases
mysql-test/r/mysqlcheck.result:
  Update result, mysql_upgrade should check _all_ databases
mysql-test/r/sp-destruct.result:
  Be more selective which databases and tables are select in the queries
mysql-test/r/sp-error.result:
  Backup and restore mysql.proc table
mysql-test/r/sp-security.result:
  Be more selective which databases and tables are select in the queries
mysql-test/r/sp.result:
  Be more selective which databases and tables are select in the queries
mysql-test/suite/rpl/r/rpl_bug33931.result:
  Move the setting of debug flag into the test file instead of in -slave.opt
  Add supression
mysql-test/suite/rpl/r/rpl_idempotency.result:
  Add supression
  Add master-slave-end.inc
mysql-test/suite/rpl/t/rpl_bug33931.test:
  Move the setting of debug flag into the test file instead of in -slave.opt
  Add supression
mysql-test/suite/rpl/t/rpl_idempotency.test:
  Add supression
  Add master-slave-end.inc
mysql-test/t/information_schema.test:
  Be more selective which databases and tables are select in the queries
mysql-test/t/sp-destruct.test:
  Be more selective which databases and tables are select in the queries
mysql-test/t/sp-error.test:
  Backup and restore mysql.proc table
mysql-test/t/sp-security.test:
  Be more selective which databases and tables are select in the queries
mysql-test/t/sp.test:
  Be more selective which databases and tables are select in the queries
mysql-test/include/check-warnings.test:
  New BitKeeper file ``mysql-test/include/check-warnings.test''
mysql-test/include/mtr_warnings.sql:
  New BitKeeper file ``mysql-test/include/mtr_warnings.sql''
2008-04-08 16:51:26 +02:00
unknown
24640ab982 Find ndb binaries
Verbose SafeProcess.pm 


mysql-test/mysql-test-run.pl:
  Cleanup how script find ndb binaries and paths
  Remove "executable_setup_failed" code, i.e either we have ndb support or we don't
  Remove ndb_extra_test, not used by any test. If there is a need for that, just 
  create a new suite
mysql-test/lib/My/Find.pm:
  Add possibility to use my_find_bin for a binary that is not required
mysql-test/lib/My/SafeProcess.pm:
  Add verbose printous that can be turned on
  Wait on process also if start_kill failed
  Turn verbose on for windows
mysql-test/lib/My/SafeProcess/safe_kill_win.cc:
  Extend sleep from 0 to 100
mysql-test/lib/mtr_cases.pm:
  Remove ndb_extra
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
  Extra checks should be for Last_IO_Errno
2008-03-13 17:16:42 +01:00
unknown
27c7181d98 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-win
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/mtr_cases.pm:
  Auto merged
2008-03-10 16:42:04 +01:00
unknown
18c62e62ed Mark test that includes "ndb_master-slave.inc" as ndb_test 2008-03-10 16:40:19 +01:00
unknown
f1ca85404b Look for sourced file relative to test first 2008-03-10 12:53:35 +01:00
unknown
78100d80ea Only uise one file for current test
Don't retry by default
Fixes for --embedded


mysql-test/lib/My/ConfigFactory.pm:
  Don't copy log-error to [embedded] section
mysql-test/lib/mtr_cases.pm:
  Auto skip all not_embedded when running with embedded
mysql-test/mysql-test-run.pl:
  Only uise one file for current test
  Don't retry by default
mysql-test/t/csv.test:
  Change master-data -> mysqld.1/data
mysql-test/t/innodb.test:
  Change master-data -> mysqld.1/data
mysql-test/t/ps_1general.test:
  Change master-data -> mysqld.1/data
mysql-test/t/trigger.test:
  Change master-data -> mysqld.1/data
2008-02-25 16:41:59 +01:00
unknown
0d01221c17 Use My::Platform
Put all path conversions in one file
Convert the --tmpdir  passed to "mysqld --verbose --help"


mysql-test/lib/My/Find.pm:
  Use My::Platform
mysql-test/lib/My/SafeProcess.pm:
  use My::Platform
mysql-test/lib/mtr_cases.pm:
  Use My::Platform
mysql-test/lib/mtr_misc.pl:
  Move 'mtr_native_path' to My::Platform
mysql-test/lib/My/Platform.pm:
  New BitKeeper file ``mysql-test/lib/My/Platform.pm''
mysql-test/lib/t/Platform.t:
  New BitKeeper file ``mysql-test/lib/t/Platform.t''
2008-02-20 14:55:30 +01:00
unknown
211e5e4658 Make mtr_report.pl into it's own package
Remove mtr_log_*


BitKeeper/deleted/.del-mtr_settings.pl:
  Delete: mysql-test/lib/mtr_settings.pl
2008-02-04 11:16:25 +01:00
unknown
7b29399e02 Merge bk-internal:/home/bk/mysql-5.1-maint2
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/mtr_cases.pm:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2008-02-04 09:16:37 +01:00
unknown
136e285055 Add --verbose-restart
mysql-test/lib/mtr_cases.pm:
  Fix typo
mysql-test/mysql-test-run.pl:
  Add --verbose-restart
  Remove unused
mysql-test/lib/mtr_report.pl:
  Add 'mtr_verbose_restart'
mysql-test/lib/t/Options.t:
  Extend uint test
2008-02-04 09:15:44 +01:00
unknown
600d406283 Merge bk-internal:/home/bk/mysql-5.1-maint2
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/My/SafeProcess.pm:
  Auto merged
mysql-test/lib/mtr_cases.pm:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2008-01-18 00:06:30 +01:00
unknown
359303d9ec Allow start-from to also filter on suitename 2008-01-11 10:44:16 +01:00
unknown
0a69b0b833 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-parts
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/mtr_cases.pm:
  Auto merged
2008-01-10 17:17:04 +01:00
unknown
c6a1ed022c - Add autodetection of which my.cnfs to use for each testcase if suite does
not have a my.cnf of it's own
- Fix paths: master-data => mysqld.1/data, ../std_data_ln => MYSQLTEST_VARDIR/std_data


mysql-test/lib/mtr_cases.pm:
  Add autodetection of which my.cnfs to use for each testcase if suite does
  not have a my.cnf of it's own
mysql-test/suite/parts/inc/partition.pre:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_basic.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_check_drop.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_layout.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_layout_check1.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_layout_check2.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
  Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data
mysql-test/suite/parts/r/part_supported_sql_func_innodb.result:
  Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data
mysql-test/suite/parts/r/part_supported_sql_func_myisam.result:
  Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data
mysql-test/suite/parts/r/partition_alter1_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter2_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter3_innodb.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter3_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter4_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_engine_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_syntax_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_t55.out:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/t/partition_sessions.test:
  Update paths, master-data => mysqld.1/data
2008-01-10 16:50:37 +01:00
unknown
85ba3d96c8 Fix reorder 2008-01-09 11:15:59 +01:00
unknown
a216016255 Skipp adding combinations for test tat already are skipped 2008-01-08 21:26:55 +01:00
unknown
919fed54d0 Try to dynamically change option, restart if it fails
mysql-test/mysql-test-run.pl:
  Try to dynamically change option, restart if it fails.
mysql-test/lib/mtr_cases.pm:
  Try to dynamically change option, restart if it fails.
mysql-test/lib/mtr_misc.pl:
  Move functions to My::Optiosn
mysql-test/lib/mtr_report.pl:
  Add a small dot if test detected restart
mysql-test/lib/My/Options.pm:
  New BitKeeper file ``mysql-test/lib/My/Options.pm''
mysql-test/lib/t/Options.t:
  New BitKeeper file ``mysql-test/lib/t/Options.t''
2008-01-07 19:44:48 +01:00
unknown
91775a12af Improve error message 2008-01-07 15:38:25 +01:00