1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #59979 Add mtr option to run debug server, but without turning on debug

Browse Source 
Added --debug-server and use $opt_debug_server where appropriate
Let --debug imply --debug-server
When merging to 5.5, must adapt fix for 59148
Oops, set debug => debug-server too late, fixed
This commit is contained in:
Bjorn Munch 2011-02-07 12:42:21 +01:00
parent bb3e48c29a
commit 114ac525f2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/mysql-test-run.pl
View File

@ -182,6 +182,7 @@ my $opt_cursor_protocol;
my $opt_view_protocol; my $opt_view_protocol;
our $opt_debug; our $opt_debug;
our $opt_debug_server;
our @opt_cases; # The test cases names in argv our @opt_cases; # The test cases names in argv
our $opt_embedded_server; our $opt_embedded_server;
@ -936,6 +937,7 @@ sub command_line_setup {
# Debugging # Debugging
'debug' => \$opt_debug, 'debug' => \$opt_debug,
'debug-server' => \$opt_debug_server,
'gdb' => \$opt_gdb, 'gdb' => \$opt_gdb,
'client-gdb' => \$opt_client_gdb, 'client-gdb' => \$opt_client_gdb,
'manual-gdb' => \$opt_manual_gdb, 'manual-gdb' => \$opt_manual_gdb,
@ -1082,6 +1084,9 @@ sub command_line_setup {
my $path_share= dirname($path_language); my $path_share= dirname($path_language);
$path_charsetsdir= mtr_path_exists("$path_share/charsets"); $path_charsetsdir= mtr_path_exists("$path_share/charsets");
# --debug implies we run debug server
$opt_debug_server= 1 if $opt_debug;
if (using_extern()) if (using_extern())
{ {
# Connect to the running mysqld and find out what it supports # Connect to the running mysqld and find out what it supports
@ -1712,7 +1717,7 @@ sub find_mysqld {
my @mysqld_names= ("mysqld", "mysqld-max-nt", "mysqld-max", my @mysqld_names= ("mysqld", "mysqld-max-nt", "mysqld-max",
"mysqld-nt"); "mysqld-nt");
if ( $opt_debug ){ if ( $opt_debug_server ){
# Put mysqld-debug first in the list of binaries to look for # Put mysqld-debug first in the list of binaries to look for
mtr_verbose("Adding mysqld-debug first in list of binaries to look for"); mtr_verbose("Adding mysqld-debug first in list of binaries to look for");
unshift(@mysqld_names, "mysqld-debug"); unshift(@mysqld_names, "mysqld-debug");
@ -2402,9 +2407,9 @@ sub check_debug_support ($) {
#mtr_report(" - binaries are not debug compiled"); #mtr_report(" - binaries are not debug compiled");
$debug_compiled_binaries= 0; $debug_compiled_binaries= 0;
if ( $opt_debug ) if ( $opt_debug_server )
{ {
mtr_error("Can't use --debug, binaries does not support it"); mtr_error("Can't use --debug[-server], binary does not support it");
} }
return; return;
} }
@ -5582,6 +5587,8 @@ Options for debugging the product
client-gdb Start mysqltest client in gdb client-gdb Start mysqltest client in gdb
ddd Start mysqld in ddd ddd Start mysqld in ddd
debug Dump trace output for all servers and client programs debug Dump trace output for all servers and client programs
debug-server Use debug version of server, but without turning on
tracing
debugger=NAME Start mysqld in the selected debugger debugger=NAME Start mysqld in the selected debugger
gdb Start the mysqld(s) in gdb gdb Start the mysqld(s) in gdb
manual-debug Let user manually start mysqld in debugger, before manual-debug Let user manually start mysqld in debugger, before