From: Bjorn Munch
Date: February 7 2011 10:21am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2980) Bug#59979
List-Archive: http://lists.mysql.com/commits/130541
X-Bug: 59979
Message-Id: <201102071021.p17ALjSv021366@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2126813792=="

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

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

 2980 Bjorn Munch	2011-02-07
      Bug #59979 Add mtr option to run debug server, but without turning on debug
      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

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-04 11:33:45 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-07 10:19:44 +0000
@@ -182,6 +182,7 @@ my $opt_cursor_protocol;
 my $opt_view_protocol;
 
 our $opt_debug;
+our $opt_debug_server;
 our @opt_cases;                  # The test cases names in argv
 our $opt_embedded_server;
 
@@ -936,6 +937,7 @@ sub command_line_setup {
 
              # Debugging
              'debug'                    => \$opt_debug,
+             'debug-server'             => \$opt_debug_server,
              'gdb'                      => \$opt_gdb,
              'client-gdb'               => \$opt_client_gdb,
              'manual-gdb'               => \$opt_manual_gdb,
@@ -1101,6 +1103,9 @@ sub command_line_setup {
     mtr_print_thick_line('#');
   }
 
+  # --debug implies we run debug server
+  $opt_debug_server= 1 if $opt_debug;
+
   if ( @opt_experimentals )
   {
     # $^O on Windows considered not generic enough
@@ -1712,7 +1717,7 @@ sub find_mysqld {
   my @mysqld_names= ("mysqld", "mysqld-max-nt", "mysqld-max",
 		     "mysqld-nt");
 
-  if ( $opt_debug ){
+  if ( $opt_debug_server ){
     # 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");
     unshift(@mysqld_names, "mysqld-debug");
@@ -2402,9 +2407,9 @@ sub check_debug_support ($) {
     #mtr_report(" - binaries are not debug compiled");
     $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;
   }
@@ -5582,6 +5587,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-server          Use debug version of server, but without turning on
+                        tracing
   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


--===============2126813792==
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/dbsrv-51/
# testament_sha1: 111595a83effb212cbc122ba5936b68380362bd6
# timestamp: 2011-02-07 11:21:45 +0100
# base_revision_id: bjorn.munch@stripped\
#   z7oyjpxcvko3k61x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSqTxyIAAhD/gFEwBABc5///
egYCjr////hQBIZ7WnXYu5ijTaoJJTTQTTCmNT0TaaJ6TTFPUyMmmj0Jk0000GiBGTNI1MSGQAAA
DQAAAyENKeRT0mmGgQTRkaZoDQBAGg5piZMmjCYJiaYBMAhgjAjAJJET0yAhiNRtFHohmkGgNADQ
NIkW16ST4hqbuxeUmcbMHlB6WwqRsFvfFQJc8l8mpoHuvovjfHDWkDjA1zIdT+NRTG+ElcafX/cZ
L+PKwMyM3iJyTWv1RUTSqjGgvdQ17ZtUZYtLTwK3pqu4sODe4DErnzLlf3+0bn1jQ9FrT9wkLRA2
5Ia0pEK7CiNgwMNDJ+L816y3J/BwtQvoxTytePY3aXP+rEnoqFYd4j+9qKbsMTU4sDz0Tbym5Zqn
aEigSxNK6GJ5GyjYWtnNK4Y2JwibMGANYmB4UDqI6B04oTzZd8oKGhRZqQqiIBD5IsCunbYC5IkX
XEL+VrKghzUCTqaRztrpkHevmP/crZDF1l4xMO7nq/E8WgTqywaowmcYKOohZtBSEbL5yAXY1F5i
aNLBMPryqFZvurmjNaXioQ5BXiyvPS4HjRpZ20Fr0JOPhLB5SugCXZQSKQUYMxoeQU4mzeRQ20hD
PSXU1EOJmZnNdXXRObdWT7LtFN0xNyR4w0zGOEVljxn9XsRV8mTTBPy0kJ1Cj5CS2paOLKtzf52V
oo/C8sLgT9sVAlzvpAsigUdIHWYix05Aq3GlRPFwOZawyRjBQMSs2QsJBQtwRc3iwO1bV0agOQqE
hAFjFFzsegYHutiSzUQZWjTNiKDlEbjYRhFG2zV21dg7dlw243MNwv8Ov58EieeRmTHprJYYX8YM
Tbu6SmFXI7LHBgFPCE1jHpHHKvIhItsnZADZuT+8JjK2lEMSLdG+GZYxwH+kTp6uYMznGd9rnRwE
ED/EjZuEZHEm9ZaQlihY32jmSO1IuukmKKM7c5dZOt71Bwep4KJ9/7K7OwZMzcfeBhYpryKsVGmo
2VnQ3X8MCk31wYM9NYufbK+0ogdMG+UQTNnru0fSJnV4sOtoPGAw2HemTJFGTE5PyZbYbXCWfm7m
jlGY9pw5roU+JSVn39GHLhveZHmJhpHZwtM2XUO5AwwzIXFGFNZ4DAswSfG3KbeelA414VTuvTT3
R4/VthOZk8hWj8hTgnPl55+WKyZg2hhsOil+NxccD7Y0jcr8nKKBQcwUretVwdNQVOCmVIads0uu
zowrA/ckXqPNnmMvgRxPHkX87UQuTbyHDSdqsMiixIEiBUaOMKKzi6EhFA5hFSMEpUSTIeyZarzY
sIpOmS0ExIHOxuiX9SfM73SMIOVALOOWTFd9TuV3f0LIjK1WpmURg0qAoMpa+KFzwJaVWODluUWN
Da6HD2FiMph6S8j50VX3ExZyzJNRRoCvSHDokxjmLogm2R4mMYrYP9dSg3AiIzhhw8dXvB0ls6Pi
3VxDG21lUDExY9+vThdfE7mMXA4nMltglGLb3NlQXBKCVltwtcVAtO+PdWDqaSExsv9TIDp8cUeF
SR0iiXXlRO8kdcay1OEoZBOmcFF2qIy7BfAg20cttKIG+1dVQdJF7LnmsKKfz/xdyRThQkCqTxyI


--===============2126813792==--