Skip to content

M
MariaDB
Commit 5dee5507 authored by unknown's avatar unknown
Browse files
Options

WL#2936 - Falcon & MySQL plugin interface: server variables 

Fix tests when InnoDB is not built-in. Innodb options would cause
mysqld to abort with an error indicating that the option is unknown.
Fix tests on Windows where mysql-test-run.pl was unable to probe
mysqld for version and variables information, caused by output
being redirected to a log file instead.


mysql-test/mysql-test-run.pl:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is not required here. This test case runs only
  if innodb is available. In this case the option must be present.
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is not required here. This test case runs only
  if innodb is available. In this case the option must be present.
mysql-test/t/federated_transactions-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/myisam-blob-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_auto_increment-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_deadlock_innodb-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_insert_id-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_insert_id_pk-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_insert_ignore-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_multi_engine-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_ndb_relayrotate-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_read_only-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_relayrotate-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_basic_11bugs-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_basic_11bugs-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_create_table-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_func003-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_sp003-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_sp003-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_stm_000001-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/warnings-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
sql/mysqld.cc:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Do not enable the 'old-fashioned error log' when the user has
  '--help' specified on the command line. We do want the help
  output sent to the console. This fixes help output on Windows
  because it enables this option by default.
parent 6cb6bb85
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 26 deletions
mysql-test/mysql-test-run.pl
View file @ 5dee5507
......@@ -3784,14 +3784,14 @@ sub mysqld_arguments ($$$$) {
mtr_add_arg($args, "%s--server-id=%d", $prefix,
$idx > 0 ? $idx + 101 : 1);
mtr_add_arg($args, "%s--innodb_data_file_path=ibdata1:10M:autoextend",
mtr_add_arg($args, "%s--loose-innodb_data_file_path=ibdata1:10M:autoextend",
$prefix);
mtr_add_arg($args, "%s--local-infile", $prefix);
if ( $idx > 0 or !$use_innodb)
{
mtr_add_arg($args, "%s--skip-innodb", $prefix);
mtr_add_arg($args, "%s--loose-skip-innodb", $prefix);
}
my $cluster= $clusters->[$mysqld->{'cluster'}];
......@@ -3835,7 +3835,7 @@ sub mysqld_arguments ($$$$) {
mtr_add_arg($args, "%s--report-port=%d", $prefix,
$mysqld->{'port'});
mtr_add_arg($args, "%s--report-user=root", $prefix);
mtr_add_arg($args, "%s--skip-innodb", $prefix);
mtr_add_arg($args, "%s--loose-skip-innodb", $prefix);
mtr_add_arg($args, "%s--skip-slave-start", $prefix);
# Directory where slaves find the dumps generated by "load data"
......
mysql-test/t/binlog_row_mix_innodb_myisam-master.opt
View file @ 5dee5507
--loose-innodb_lock_wait_timeout=2
--innodb_lock_wait_timeout=2
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt
View file @ 5dee5507
--loose-innodb_lock_wait_timeout=2
--innodb_lock_wait_timeout=2
mysql-test/t/myisam-blob-master.opt
View file @ 5dee5507
--max-allowed-packet=24M --skip-innodb --key-buffer-size=1M
--max-allowed-packet=24M --loose-skip-innodb --key-buffer-size=1M
mysql-test/t/rpl_deadlock_innodb-slave.opt
View file @ 5dee5507
--innodb --loose-innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096
--innodb --innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096
mysql-test/t/rpl_ndb_relayrotate-slave.opt
View file @ 5dee5507
-O max_relay_log_size=16384
--innodb
--loose-innodb
--log-warnings
mysql-test/t/rpl_relayrotate-slave.opt
View file @ 5dee5507
-O max_relay_log_size=16384
--innodb
--loose-innodb
--log-warnings
mysql-test/t/rpl_row_basic_11bugs-master.opt
View file @ 5dee5507
--binlog_ignore_db=test_ignore --innodb
--binlog_ignore_db=test_ignore --loose-innodb
sql/mysqld.cc
View file @ 5dee5507
......@@ -3189,8 +3189,12 @@ static int init_server_components()
/* Setup logs */
/* enable old-fashioned error log */
if (opt_error_log)
/*
Enable old-fashioned error log, except when the user has requested
help information. Since the implementation of plugin server
variables the help output is now written much later.
*/
if (opt_error_log && !opt_help)
{
if (!log_error_file_ptr[0])
fn_format(log_error_file, pidfile_name, mysql_data_home, ".err",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7