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.
This commit is contained in:
parent
9126286a6a
commit
a57260dbfb
@ -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"
|
||||
|
@ -1 +1 @@
|
||||
--loose-innodb_lock_wait_timeout=2
|
||||
--innodb_lock_wait_timeout=2
|
||||
|
@ -1 +1 @@
|
||||
--loose-innodb_lock_wait_timeout=2
|
||||
--innodb_lock_wait_timeout=2
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1 +1 @@
|
||||
--max-allowed-packet=24M --skip-innodb --key-buffer-size=1M
|
||||
--max-allowed-packet=24M --loose-skip-innodb --key-buffer-size=1M
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1 +1 @@
|
||||
--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
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1,3 +1,3 @@
|
||||
-O max_relay_log_size=16384
|
||||
--innodb
|
||||
--loose-innodb
|
||||
--log-warnings
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1,3 +1,3 @@
|
||||
-O max_relay_log_size=16384
|
||||
--innodb
|
||||
--loose-innodb
|
||||
--log-warnings
|
||||
|
@ -1,2 +1,2 @@
|
||||
--binlog_ignore_db=test_ignore --innodb
|
||||
--binlog_ignore_db=test_ignore --loose-innodb
|
||||
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
@ -1 +1 @@
|
||||
--skip-innodb
|
||||
--loose-skip-innodb
|
||||
|
@ -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",
|
||||
|
Loading…
x
Reference in New Issue
Block a user