From: Bjorn Munch
Date: February 16 2011 11:24am
Subject: bzr commit into mysql-5.5 branch (bjorn.munch:3328)
List-Archive: http://lists.mysql.com/commits/131406
Message-Id: <201102161124.p1GBOOa3012736@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0670577580=="

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

#At file:///home/bm136801/my/main-55/ based on revid:dmitry.lenev@stripped

 3328 Bjorn Munch	2011-02-16
      Removed unused code accidentally pushed with Bug @58122

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-09 15:25:34 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-16 11:24:17 +0000
@@ -1560,12 +1560,6 @@ sub command_line_setup {
     $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);


--===============0670577580==
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/main-55/
# testament_sha1: dc5456f324f408f62cdfbccfd3968bf845dc0057
# timestamp: 2011-02-16 12:24:24 +0100
# source_branch: file:///home/bm136801/my/mtr-55/
# base_revision_id: dmitry.lenev@stripped\
#   ssyuf0i2fhrb595k
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQe81RoAAWffgAAQUGP/91IC
EAC////wUAN1zevK8aOrz2uEkiE0yeiaj00Yg0DQp4mUPUDJJhTaeiNExIYQHlGg0AEpNATSZPUy
R6mTeqZG1AaA0aCSQ1JmqeI01PUeJNGg9TQAGgSgqHqZkjamibKGGowRoyGJHEc5TCW2iisrNaAI
EpBjGryvQInPQdGvCTTJFq16NlxxaHb5E/0z2B5V7r8wpbvyHMls+5D8EVSNZeKjyYSNtqncUxwS
HU0i1oRrkLHaoYk2ESkMIaojrbUnVzw2LYKZNlhpQIuK85iNSekTD0Q61XYKgY15zo949y70aE6L
gfOwUO4NB1xiCxvFxmJ9whLSpMtuuxUNxBFmIOJgUSF2uoocw+dbBjNBOtI5ZvY8vObeCs6hFd4W
WQw/fsNGDAiMLQuAuBaJoeymiMWxg4Y8vJ3N6/0yNMhJwnXC9zU2RSOr43tMktDmX3lb4Qr3VSo1
e2hOiiSINbtY6whj1JMf04mNgjlLIi7ZmNVUh4tsuVjRx3tyvrhFwlPEMWIgXnbcL4WstKGdKS5C
R16ZXNL3XORX6mQoKOVGRY4kEJMx9jzhbZO9w3T84ZenFMlJOyY96pImdmhEjvK8YLTSWtfWYZM2
/okazJC0ojCvtNU0WedEi6i31GOwlVeBo03msZ3un9CfQby/aFJhvLjKQmovkhLC0Rdr0yPZI2be
5IkpC0v5NWyRcVDKjps8uD3Jd2iZ3OhEbdCDrEL6xw4yTRechwO1EubRJiznyh0fhbb2jw18L89b
O1cYPaX04/lS7GqlOTtNn3u8X3RjMVLKE/KJR2GK1107VZwyEhupL1150/TGUo4ozYfTRCf8HoNQ
ZGpXW6BMYLbcZ+fxQZYXESSOWWe4ZO3lY9gXh42A+1j1OJ15gcxL9ItJyVoYrDaFIUuCiVIbM3he
LdHJ06mKhDubtXBVQeRelv6Y5wgVgenS1JyyLSwDoxuFL3ioGIMx7FGq0iKLKiC79BX2dgoAnPRj
i5+JHEKlWg4RWvE4K7nyZlIfJU3vRT9jBu07hZ5K8sSUvpOi3w0Es5AmK05D364CjEY1aLhbBhY3
YCxTDh+MzqEYoqRBRxpJm9mGbaZWwPVvpUzizozWyKQiCkEc1F0iVEeY0T0tE3wmnTgBSd23jcZJ
g9FQjKPMW4jsKBOVFjIjLt0wbSpPri5Wks/r/i7kinChIA95qjQ=


--===============0670577580==--