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

--===============1680834095==
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
      Oops, set debug => debug-server too late, fixed

    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 11:42:21 +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,
@@ -1082,6 +1084,9 @@ sub command_line_setup {
   my $path_share= dirname($path_language);
   $path_charsetsdir=   mtr_path_exists("$path_share/charsets");
 
+  # --debug implies we run debug server
+  $opt_debug_server= 1 if $opt_debug;
+
   if (using_extern())
   {
     # 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",
 		     "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


--===============1680834095==
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: 2218325577c280dda71c4a5fca824e0e04c20889
# timestamp: 2011-02-07 12:43:01 +0100
# base_revision_id: bjorn.munch@stripped\
#   z7oyjpxcvko3k61x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUGUtc0AAgT/gFEwBABc5///
egaCjr////hQBKZPbtrG9z21hlbvc8JJTQaTTTQ0NNANCaepqA0NPSG1D0hmoNINCBmqbQpkyAAD
QABoBoA0EaKeiekGjU9Jpk0A00AAAAAMUEaBGU9Q09Q0APKHqaYINAAAJIiaMpkaU9PTVPSeTSeT
KaPUANAAaDRGjRj1j+sN9vDDzfUNrrXN370QqVpn8tslAlyluy7JXRu3biSGTdkSBxM2tkOv+Nhg
kihJXGzz9aX7fvjYGZFfkJTilGo0M7EQVmFZAti48r2v2rG4mTy1mq0XpYc5PcYW1rFxtD99WvXL
otjXdWVH06AqDinF2U4yYLGLhI3Sco2ubplqNselO2QCwi8mJuNDhzGjBA7mxk1YYkYDzEenxRdw
1VljitH61TahZi/AGaDCkTiWBnuiyDaIx7LWwt7QkO2SI3BOI/MrDxOhRChQcVevskFnaZIk4qaZ
ilzn03ZgnmQdwGjwUCUTnAEGJwMYRbpfEEDcBaCY57Sg1BKykBC7fIMBWHprjUKAsI8X0VOIrdEh
QwKaNUTOp6CeXaCmIlpFIUjTYG3Ppa4bFgQBrmSrPOmCrMZHpNnjLVW+bFVgoEBfENXCS2APjlKB
QhCogDsRApVKGvMPUO80Naa8MxbjVuPARokmarDK4GMkgLHDEJytDc9I0jXuylWCSumAljXe3OTX
xUDCIFfxxN9lpbkTdDZBpfjqLIsFOgKnJbTlImANdYWYTqPeIballBUHhbxWiPReEYScahOm5FUx
cq2IfVirffhMUB8jpnQhCp8jc8zfNA5CNjcIANA8GboqzBst23uYmIK+Fvh1i/oJD6IJFD1vEjnP
WpazaqSVS9aPRbWKJzEFqNg7Hfgb9OPVPLxZIvzZoB589f3jWZONEV6ie9+HEz7tDW6w2mwZ/reK
+D4Ais7iZj0CODr2of2HeQGC0mvbRVoVdlJAyR8EiO5MmWJ9lNnc+aIvKYdifKDF7CwZgiklq/Go
GfDJLyCE+nALqharf6LgsDHnfnytG3p2G7rpsqLXhaHLShGJaP137eEpNGmy1iXT4sE20OIooA0V
1NL67N52NpJ3bNKYDHIEh8xThXriUb0/GYsFei2HHpJTjpvLOy4EFqGGGYV0TCW9GLZCdRgVQP68
MpwsoQOKbqo7bE0+mSno2cnMqiIVy8QouTnd+c+SOqZg4BdqN1BFS41HE+dKR2rfiZNmCEV5WrZq
DvoEUODDRMkNcbLc3ZN86mitSNqkt58hj8iuVRUS7fWkPh2cVfSy54GDlrRSIpzq3jmSyqtkhnD1
FTopMvOAp2okyZeHfNpKzjlFPWCYlCxi2V69f8lJPD6JEYOV8FoHKe/r+RyWvw7FlosZlUT6U5cb
DZVKLwYCd6tHDlsU2JN3rHUGFgIuDSTzNeRPXSHDBdAkzCVrhNlEYjSgK4DC8k0MW0pSZlpH9VRQ
JgwZmgMIihFnmASRaJAtzvPTtgYHJRWAKDRFjLsS7UuoHgoW7EBRAiZzhxmGT5MFCQahK27MXVrI
Fy6DueBW6pIiY83pZIOQuG6iP9ckTL+YtIwKHKy4wFeoJKzUEkzhPPooMvgSi9ByquIkNN5WzBuJ
XMs0N0fN0/4u5IpwoSCDKWua


--===============1680834095==--