database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

upmerged and adapted 59979

Browse Source
This commit is contained in:
Bjorn Munch
2011-02-07 12:55:34 +01:00
parent c71b7afe42 3cde3f303f
commit ff8d8984a4
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,6 +191,7 @@ my $opt_view_protocol;
our $opt_debug; our $opt_debug;
my $debug_d= "d"; my $debug_d= "d";
my $opt_debug_common; my $opt_debug_common;
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;
@ -979,6 +980,7 @@ sub command_line_setup {
# Debugging # Debugging
'debug' => \$opt_debug, 'debug' => \$opt_debug,
'debug-common' => \$opt_debug_common, 'debug-common' => \$opt_debug_common,
'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,
@ -1135,6 +1137,9 @@ sub command_line_setup {
($auth_plugin)= find_plugin("auth_test_plugin", "plugin/auth"); ($auth_plugin)= find_plugin("auth_test_plugin", "plugin/auth");
# --debug[-common] implies we run debug server
$opt_debug_server= 1 if $opt_debug || $opt_debug_common;
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
@ -1787,7 +1792,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");
@ -2016,7 +2021,7 @@ sub read_plugin_defs($)
or mtr_error("Can't read plugin defintions file $defs_file"); or mtr_error("Can't read plugin defintions file $defs_file");
# Need to check if we will be running mysqld-debug # Need to check if we will be running mysqld-debug
if ($opt_debug) { if ($opt_debug_server) {
$running_debug= 1 if find_mysqld($basedir) =~ /-debug$/; $running_debug= 1 if find_mysqld($basedir) =~ /-debug$/;
} }
@ -2516,9 +2521,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;
} }
@ -5760,6 +5765,8 @@ Options for debugging the product
debug Dump trace output for all servers and client programs debug Dump trace output for all servers and client programs
debug-common Same as debug, but sets 'd' debug flags to debug-common Same as debug, but sets 'd' debug flags to
"query,info,error,enter,exit" "query,info,error,enter,exit"
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