From: Bjorn Munch
Date: November 29 2010 12:21pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2952) Bug#58122
List-Archive: http://lists.mysql.com/commits/125331
X-Bug: 58122
Message-Id: <201011291221.oATCLrZu028675@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0674327082=="

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

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

 2952 Bjorn Munch	2010-11-29
      Bug #58122 Using DBUG_EXECUTE_IF and normal DBUG printouts not compatible
      Added option --debug-common which setd '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-05 14:26:38 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-11-29 12:20:56 +0000
@@ -166,6 +166,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;
 
@@ -912,8 +914,9 @@ sub command_line_setup {
              'extern=s'                  => \%opts_extern, # Append to hash
 
              # Debugging
-             'debug'                    => \$opt_debug,
-             'gdb'                      => \$opt_gdb,
+	     'debug'                    => \$opt_debug,
+	     'debug-common'             => \$opt_debug_common,
+	     'gdb'                      => \$opt_gdb,
              'client-gdb'               => \$opt_client_gdb,
              'manual-gdb'               => \$opt_manual_gdb,
              'manual-debug'             => \$opt_manual_debug,
@@ -1465,6 +1468,12 @@ sub command_line_setup {
 	       join(" ", @valgrind_args), "\"");
   }
 
+  if ($opt_debug_common)
+  {
+    $opt_debug= 1;
+    $debug_d= "d,query,info,error,enter,exit";
+  }
+
   mtr_report("Checking supported features...");
 
   check_ndbcluster_support(\%mysqld_variables);
@@ -1761,7 +1770,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)
   }
 }
@@ -2860,7 +2869,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);
   }
 
@@ -4438,7 +4447,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());
   }
 
@@ -5528,6 +5537,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


--===============0674327082==
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/ldebug-51/
# testament_sha1: cfd227370f04a66aa91a3a709bd4b9b953304dc1
# timestamp: 2010-11-29 13:21:53 +0100
# base_revision_id: bjorn.munch@stripped\
#   jex9j2wov87hzmiq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeeKXAkAAhz/gGEwVABe5///
f6IORL////pQBNovTqC4eR465Z7sJRE0JkaaaNDRlT2kyMk8U8ppo0PUzSabUPRpAyUYqn+E0yNT
RlNTyQ9TQZGATIxDCMhoCSIImqf6FR+k1PI1M1MT9U2oekaPUDTTQaNGgaDakqfpqDTTTTSepozS
MjQ0NBkA0AAACSk0mmQynkaTTTyaTyTGo0NDQAAAAVgSCT5s+B27vGV8Ml3W6q0R7bCO/q3pyPhG
PhoJdlcuLMOzseiV9yx2LyIgPBOnnWjULppPD2OXDxlixeOtUVRG+SGF58UValovsMK5LlgbBQ1t
jEwaqPeXGe3ayp9a6LuMoqdhjONLqRywLybvUmsxtM8JNEP4XqJ8eFuSymWIqSOaqBEbYyfmHT+T
qaLwb1ngWXT10KjlURyWMH3VVnI86xEwwoLluBTHuIgDmCHYyrMK1iKbBDbvWTGzGkWxLc7GvMI2
TjJaphxcrpQ80YM2UfC0cgIZImc7l5i9imk+yT77vNMqF7E4fkm9yLGVZFaYJxFIOas5xlD4uBDC
peLQbBBgPmjSZZYesLtGUby14XfdIgrUx0apWlJk4WUllaMCk7xqZqlwAnFX3EDZ2sEQ4MJS2oHR
Z4le3/RpsnUpRskGVO27aSfAPklYfNRhVAYKMVSCPxewaNqqBCYiOkTEtGhnkKwzCbzBrq55LNYS
5NIGrM0oEBwTBvUmvUMw16g91KQvhMFAmODEmwOVRGhjW0oc4V/vUPWDGUMgEMxFfMKY3XttSQuu
LniwLFhUPIHDC4QwjiFVQvTzlsnTroJKrc0lwULMIzybWwpuFuXiVeST8niLbpIbNOODVE5Z4k3T
VNIyBDaSFlMGYvdxAaZKIIXNUVyd/b4R7u1OjWiGpLcaqKq+ZxeFmHevP15cxr/Fug9HolTgz5lB
QBSJjWVDunadBW1M4vXE52s+A03GqCDsdHKnyVEKCWySvBtMuznPG/QstpC0f0dEj1PZdJzdFuTA
NJ9uDqD3moVnphjeehQQm9iRU8CFmWbOoQmUVgxxYJWSGxROYFoBWtBrk1vCyrtR6Jp7mOzUNIa9
GJ5SqWyK2rvdMpaztxp3vcMYxV6xnPtJ4XCzoXXdRgJf37CdznotBmOmN+rfkVjYwkrnQQ6rdhtz
JbuK07xL222qz/thtPyYkYkhJgZ0vlPWcKqYBcTCEjDHdTPZH0hsbb6LNsmNNZAYGPibapExopWY
Gql4UWRMBV58yNl2NpZMiyDAU4YYf68k9pprUqB814C42ty/uypkb2CYiI06O8QRUksPpPI9A8FS
zhl0DXW0ppQKVVFk1aUjcFvYSeYKtCq2guhdcDEYIY7iQ2qD46rd7v7VertYjQJtQVl9DFadhUk4
pvM6zakbUZqhUj5DE4hiQ1OFYxXmwsSGPByFhwH4ygVVXgiTDFdF7aTKSgvglRUZJlhc5XYX2zok
cv0FYSkkLSRhePnTspRLiKJMDMPKtJHrQhEFWRFwyl90Ip9E8lonRgJUNSWFywjWokGg/llgAH2t
tHATU9FQ8Bh62xIsf5EMsbrTI5b0Zweta82ttfGFK2CwK3IlI8wru9hwWHDIqU84o7CqdIPEt5Mz
FwzPimURFYeA8DYNhrrQWycowmwW58w+GsghewHc3LD/TAoVMlmwmN+0WxS3M5HEiiBGmJ0xEpRP
WCVG3IMR9MNBVFZJXH/F3JFOFCQ54pcCQA==


--===============0674327082==--