diff options
| -rwxr-xr-x[-rw-r--r--] | mysql-test/mysql-test-run.pl | 4 | ||||
| -rw-r--r-- | storage/maria/plug.in | 2 | ||||
| -rw-r--r-- | storage/pbxt/plug.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 723ca7926c2..e1a5b896c66 100644..100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3575,7 +3575,7 @@ sub run_testcase ($$) { # valuable debugging information even if there is no test failure recorded. sub _preserve_error_log_names { my ($mysqld)= @_; - my $error_log_file= $mysqld->value('log-error'); + my $error_log_file= $mysqld->value('#log-error'); my $error_log_dir= dirname($error_log_file); my $save_name= $error_log_dir ."/../". $mysqld->name() .".error.log"; return ($error_log_file, $save_name); @@ -3909,7 +3909,7 @@ sub check_warnings_post_shutdown { my $testname_hash= { }; foreach my $mysqld ( mysqlds()) { - my $testlist= extract_warning_lines($mysqld->value('log-error')); + my $testlist= extract_warning_lines($mysqld->value('#log-error')); $testname_hash->{$_}= 1 for @$testlist; } my @warning_tests= keys(%$testname_hash); diff --git a/storage/maria/plug.in b/storage/maria/plug.in index 02a6466bddc..686c8361a87 100644 --- a/storage/maria/plug.in +++ b/storage/maria/plug.in @@ -7,7 +7,7 @@ MYSQL_PLUGIN_STATIC(maria, [libmaria.a]) MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(maria, [ha_maria.cc]) MYSQL_PLUGIN_ACTIONS(maria, [ -AC_CONFIG_FILES(storage/maria/unittest/Makefile) +# AC_CONFIG_FILES(storage/maria/unittest/Makefile) AC_ARG_WITH(maria-tmp-tables, AC_HELP_STRING([--with-maria-tmp-tables],[Use Maria for internal temporary tables]), [with_maria_tmp_tables=$withval], diff --git a/storage/pbxt/plug.in b/storage/pbxt/plug.in index f79df759f87..67a8e7b0ac9 100644 --- a/storage/pbxt/plug.in +++ b/storage/pbxt/plug.in @@ -3,5 +3,5 @@ MYSQL_STORAGE_ENGINE(pbxt,no, [PBXT Storage Engine], MYSQL_PLUGIN_DIRECTORY(pbxt, [storage/pbxt]) MYSQL_PLUGIN_STATIC(pbxt, [src/libpbxt.a]) MYSQL_PLUGIN_ACTIONS(pbxt, [ - AC_CONFIG_FILES(storage/pbxt/src/Makefile) +# AC_CONFIG_FILES(storage/pbxt/src/Makefile) ]) |