From: Bjorn Munch
Date: December 9 2010 11:11am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3123) Bug#58122
List-Archive: http://lists.mysql.com/commits/126402
X-Bug: 58122
Message-Id: <201012091111.oB9BBlq2003193@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2100846190=="

--===============2100846190==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/debug-55/ based on revid:bjorn.munch@stripped

 3123 Bjorn Munch	2010-12-09
      Bug #58122 Using DBUG_EXECUTE_IF and normal DBUG printouts not compatible
      Added option --debug-common which sets 'd' debug flags to the suggested list

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-11-24 20:09:08 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-12-09 11:10:49 +0000
@@ -188,6 +188,8 @@ my $opt_cursor_protocol;
 my $opt_view_protocol;
 
 our $opt_debug;
+my $debug_d= "d";
+my $opt_debug_common;
 our @opt_cases;                  # The test cases names in argv
 our $opt_embedded_server;
 
@@ -963,6 +965,7 @@ sub command_line_setup {
 
              # Debugging
              'debug'                    => \$opt_debug,
+             'debug-common'             => \$opt_debug_common,
              'gdb'                      => \$opt_gdb,
              'client-gdb'               => \$opt_client_gdb,
              'manual-gdb'               => \$opt_manual_gdb,
@@ -1546,6 +1549,18 @@ sub command_line_setup {
 	       join(" ", @valgrind_args), "\"");
   }
 
+  if ($opt_debug_common)
+  {
+    $opt_debug= 1;
+    $debug_d= "d,query,info,error,enter,exit";
+  }
+
+  if ($opt_debug && $opt_debug ne "1")
+  {
+    $debug_d= "d,$opt_debug";
+    $debug_d= "d,query,info,error,enter,exit" if $opt_debug eq "std";
+  }
+
   mtr_report("Checking supported features...");
 
   check_ndbcluster_support(\%mysqld_variables);
@@ -1843,7 +1858,7 @@ sub client_debug_arg($$) {
 
   if ( $opt_debug ) {
     mtr_add_arg($args,
-		"--debug=d:t:A,%s/log/%s.trace",
+		"--debug=$debug_d:t:A,%s/log/%s.trace",
 		$path_vardir_trace, $client_name)
   }
 }
@@ -3008,7 +3023,7 @@ sub mysql_install_db {
 
   if ( $opt_debug )
   {
-    mtr_add_arg($args, "--debug=d:t:i:A,%s/log/bootstrap.trace",
+    mtr_add_arg($args, "--debug=$debug_d:t:i:A,%s/log/bootstrap.trace",
 		$path_vardir_trace);
   }
 
@@ -4589,7 +4604,7 @@ sub mysqld_start ($$) {
 
   if ( $opt_debug )
   {
-    mtr_add_arg($args, "--debug=d:t:i:A,%s/log/%s.trace",
+    mtr_add_arg($args, "--debug=$debug_d:t:i:A,%s/log/%s.trace",
 		$path_vardir_trace, $mysqld->name());
   }
 
@@ -5692,6 +5707,8 @@ Options for debugging the product
   client-gdb            Start mysqltest client in gdb
   ddd                   Start mysqld in ddd
   debug                 Dump trace output for all servers and client programs
+  debug-common          Same as debug, but sets 'd' debug flags to
+                        "query,info,error,enter,exit"
   debugger=NAME         Start mysqld in the selected debugger
   gdb                   Start the mysqld(s) in gdb
   manual-debug          Let user manually start mysqld in debugger, before


--===============2100846190==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/debug-55/
# testament_sha1: b95d055d7a7f1abcc58ad8c1ad8b017577d4391c
# timestamp: 2010-12-09 12:11:47 +0100
# base_revision_id: bjorn.munch@stripped\
#   kjq5ca8bizxx5opr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVrdbYEAAjX/gEEwBABf5///
f6IORL////pQBP0dutqurl5mVWxc9glCKYqewmJNNiMqeNFPKeoANBpmo08o9T0gMkIp+mTI1NT1
G1NGnlAAAAAAAAlBEyJ6RNPTJqRtNRk2owmAgGg0AZMJJJhEMp4kNqn5ET2iR6T1BiNNBoaaAGgk
qaU/ImRtJGT1PU9T1NAabKNBkAaAABBJ73GfwNGsjbysZm7r+4bDwkNmUX0NcRIHv1PqkJfuLTBg
0aoZoYNTPWWHIiIjxKFuUDGT+YOXf/eF7O5jyqTNw6lBVQd4CWPgLFYV7V1MqpO8rdAta2ROcV+H
LHig0fKuzHnKrcMFTHLM7AcRsDQrzf2qR0xuNcRTGENT2rv3MZ6p0T05E1JddatcCILxqMq8wyNx
o7Hkd+6HURTZNRkHFNI5aIYuTtBCXYtKvTLUnmShXn5EUdYmXsBDHrl24MGCD8W2L4ZSRSCbflKx
Yx87Jiy99DQJIApk5ns5ZufGYRtikMbXOBlWMJ0qHxFFRVRlJokNEigDrW0cWVhD3OTFE0Gnk2pW
H6kJQR0gElMbQtYmBqeFyQwmrhKRqKdoxxmaGiJe4JYnWzMR5dvOlmEx8z865sNLDVSvrV8heETe
IqIMJ+1kimKRRzFGBR9SgJrpzgDfY9FUVBpVXkjG50TEaNrJxJCh4ZY7WWONAtLhieetdVj0jJEk
6C1loveSE2zVmjj8kEzGeaAclwZLHU3VM7taV1tvQp7E0V3FqUx4Yy1sr0dHnExqMGIVYYI45Uf/
hMRJ650ra0uhhkoWyTdz13lOF7Syxi0rNbPDr2iMOJDE5Kfg51NKSFADyeYUVsH2W201NKGI+knr
jTmN3MUyghpZZQc0iPBMQcmkzygJWKh2GM7KvsJBz1WynhMw0Fvo9PVfvSNypoZhlX8nF4s5g6eP
Tn4joOLtJ/H4V727DKZRCwCtZ0N2RxUwIMaxhvGVzC6uSBIwkuZpaS3ogtMVv5pzOogkeh58DZFp
a9hhossW6HAZCBn1gnzCa2pAp/0ymzwiJucynRWWqZUZ8LGBNCDmSPckV9awVluxjI3Jd3jLZxbI
+sroVpFZZqUoLcWna8rGGta2x7ky2JTz4mTtzG1djb96MCdRu2tXI+Ni/DFX87VZ0YS0ICX4onX4
s9FCmmLGTRKclIT7pwRktmSbI2qFLNib81kItTERQJKFdWZRU9C0Gu3SXLyu1EjfppVYMZM7cI9k
WjI5UwkdGhkdv2iPIS5O4UErDLJ/vbbSgYCqAwu1tRt2osseNaykvTx/aFXjVtPfpsjRENobNy23
Cg/zp5iROl6ITpw6yoKkku3J5bgnCdgsJZ5EQVlvzR9d/vSVJNgiMUFYRlUpT4jkmCaxp6mdIreZ
6VfxFwvTMhGByQ9OmbmGXC+pkhpB0D4S5hQRjlzkjACAyZYTjK8XBcsEgukwMb3OOeMmsXSBTMv8
kUhx1KsFren8Q7j4Na4s3IzJ6lqWS+ZRi5BPdSuomDZXaPjUYsBfRCkqGPTkXsTyELm+64ARwwyL
jHBVfIZ0UYmvoIKeCG5C6ObKWMZflrBppzX8S8XAFJqkFsCbESkLc+3u2JriVJVpAhsJVDK6U2aF
KCrXRLqRTcDOHgPAwGBWtBiFbmGmU4zrTvZSAWZNRx/qkhrsl14rpMmIvziokwUqUiBplYrFETic
YRVz8rgpGVQuIpGKcP8XckU4UJBa3W2B


--===============2100846190==--