From 1dac0a76ba53ee13d6fb0ce11e41bc1f6ddf8899 Mon Sep 17 00:00:00 2001 From: Yura Sorokin Date: Mon, 30 Mar 2020 14:29:46 -0700 Subject: [PATCH] Fixes of innodb.mysqld_core_dump_without_buffer_pool* (#1118) (#1118) Summary: - innodb.mysqld_core_dump_without_buffer_pool* MTR test cases expect core pattern to be simple 'core' and core files located in the var dir - `mysqld` is killed to dump a core using SIGSEGV Pull Request resolved: https://github.com/facebook/mysql-5.6/pull/1118 Differential Revision: D20746947 Pulled By: atish2196 --- mysql-test/include/mysqld_core_dump.inc | 4 ++-- .../innodb/r/mysqld_core_dump_without_buffer_pool.result | 2 +- .../r/mysqld_core_dump_without_buffer_pool_dynamic.result | 2 +- .../mysqld_core_dump_without_buffer_pool_with_resizing.result | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql-test/include/mysqld_core_dump.inc b/mysql-test/include/mysqld_core_dump.inc index 10a031fd9d4c..1d2687780f84 100644 --- a/mysql-test/include/mysqld_core_dump.inc +++ b/mysql-test/include/mysqld_core_dump.inc @@ -30,8 +30,8 @@ if ($pid eq "") { $cur_time = time; # Kill mysqld to dump a core -system("kill", "-s", "SIGABRT", "$pid"); -print "# Perl: Sent a SIGABRT to mysqld to dump a core.\n"; +system("kill", "-s", "SIGSEGV", "$pid"); +print "# Perl: Sent a SIGSEGV to mysqld to dump a core.\n"; $core_dir = $ENV{'MYSQLTEST_VARDIR'} . '/mysqld.1/data/'; diff --git a/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool.result b/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool.result index c3cc4ceb3a53..9e1f24fd2a16 100644 --- a/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool.result +++ b/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool.result @@ -3,7 +3,7 @@ # Get the full path name of the PID file # Expecting a "crash", but don't restart the server until it is told to # Expected max core size is 1450 MB -# Perl: Sent a SIGABRT to mysqld to dump a core. +# Perl: Sent a SIGSEGV to mysqld to dump a core. # Perl: OK! Found the core file and it's small! # Make server restart # Wait for server to be back online diff --git a/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool_dynamic.result b/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool_dynamic.result index 9088972540bf..bbcf2d187a60 100644 --- a/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool_dynamic.result +++ b/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool_dynamic.result @@ -18,7 +18,7 @@ SELECT @@global.innodb_buffer_pool_in_core_file; # Get the full path name of the PID file # Expecting a "crash", but don't restart the server until it is told to # Expected max core size is 1450 MB -# Perl: Sent a SIGABRT to mysqld to dump a core. +# Perl: Sent a SIGSEGV to mysqld to dump a core. # Perl: OK! Found the core file and it's small! # Make server restart # Wait for server to be back online diff --git a/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool_with_resizing.result b/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool_with_resizing.result index 5a95050e70ae..5c88fe30d4b6 100644 --- a/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool_with_resizing.result +++ b/mysql-test/suite/innodb/r/mysqld_core_dump_without_buffer_pool_with_resizing.result @@ -8,7 +8,7 @@ set global innodb_buffer_pool_size = 2048*1024*1024; # Get the full path name of the PID file # Expecting a "crash", but don't restart the server until it is told to # Expected max core size is 1600 MB -# Perl: Sent a SIGABRT to mysqld to dump a core. +# Perl: Sent a SIGSEGV to mysqld to dump a core. # Perl: OK! Found the core file and it's small! # Make server restart # Wait for server to be back online