From: Mattias Jonsson
Date: February 16 2010 10:42am
Subject: bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:3343)
 Bug#42438
List-Archive: http://lists.mysql.com/commits/100498
X-Bug: 42438
Message-Id: <20100216104230.1D4145BDCE4@vpn-129-150-118-19.uk.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_BRx7yeQ8c5Lo1jYGiO/RpQ)"

--Boundary_(ID_BRx7yeQ8c5Lo1jYGiO/RpQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///Users/mattiasj/clones/bzrroot/topush-51-bugteam/ based on revid:sergey.glukhov@stripped

 3343 Mattias Jonsson	2010-02-16
      post push fix for bug#42438, did not compile on non debug,
      due to ifdef of include file
     @ sql/sql_table.cc
        removed if defined since DEBUG_SYNC macro is defined in that
        include file.

    modified:
      sql/sql_table.cc
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2010-02-12 09:03:10 +0000
+++ b/sql/sql_table.cc	2010-02-16 10:42:22 +0000
@@ -22,9 +22,7 @@
 #include "sp_head.h"
 #include "sql_trigger.h"
 #include "sql_show.h"
-#if defined(ENABLED_DEBUG_SYNC)
 #include "debug_sync.h"
-#endif
 
 #ifdef __WIN__
 #include <io.h>


--Boundary_(ID_BRx7yeQ8c5Lo1jYGiO/RpQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name*0="bzr/mattias.jonsson@stripped";
 name*1=22-e3r4yoh6gk2bl73k.bundle
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename*0="bzr/mattias.jonsson@stripped";
 filename*1=22-e3r4yoh6gk2bl73k.bundle

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped
# target_branch: file:///Users/mattiasj/clones/bzrroot/topush-51-\
#   bugteam/
# testament_sha1: 688f3b8857ecbc882adc10aeb24c83c9fa94e2bb
# timestamp: 2010-02-16 11:42:29 +0100
# source_branch: file:///Users/mattiasj/clones/bzrroot/topush-51-\
#   bugteam_2/
# base_revision_id: sergey.glukhov@stripped\
#   ljzk99r334zaail2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaUqDwgAAbbfgEAQWWf//16T
CiC////wUAQYvHUc7umDFaCSVPTFGlP0xNTaZMBTUeUDQBpkZAEkiaTyZSfoJkmTTSabSGQ0NADQ
A01MpqYp4p6aZHqmmmjQB6mjQNHpHonqDmmJgATABMAAJgACYJKaEaNTyqflTxojKek9Tah6jQ9T
0QB6Q0mprzj59xfmZKwQJStLKwkVyDHl4lvhA3R5BsqJKNtE8kWIxnQQpC+198sZXbU8YG7DPULt
BEirrkCzPfLRFQUaJweQ/Jl73VaYQUY8RhaEdCtygJuv6hpUzJZEEHldjZOLdVw5qNsV7lHXEXJI
vWYFQ50ncKujZEW4ZsGZ7p61FIYQ9MsS8eIeqswuqyS7V0uLNRtoUcF8piMzhTFpedCNfTsLnux6
HeYlCxBa8u2cuEOSzlxCZmPFHZr69GAnzSM04uQRFEWodQY0WuYZgd48BTMV3KMpg7fktlTNalrd
teudii2TFs0FfpK7cNZkrHi5PopWhYusz0wKHnLy4efw0iisJ2mcWzy3Wd25dCvliTWGtc+2F6iN
RBa1eKnoUIKxNaf3oF1RuiqUHHf8Mhb8lxDGZnjoyvWF8snZD8DBTlqgWm+r1pCJYaF0bVeyuIog
sDzLiVIEyNEzzHmmoVwKSAREM1ID/AS7AbXBPQp2NOXixym2sI7p+B461Zyl5ZiowQhJmQk3C/Vu
bgsn7hqw4TTpY4I6jpveetDgyDIwP8EEX48zM3TLIOi+0lKlfPDaKKB80/yYDuWVTj2mApou2bce
fYjuC80TOJ7T3HgiGMXaTvc8a1I5jbCqg06vyJLjYncCAomXjePJFO9w92RuVFzro1ECbgGOpxkJ
sd5+IMeBbqpluUiGc32qAb31+ON47dD0c2GLE5DVlwDWLcUxCEgIKRSMn27zIKdWj+wY9Hhpji2j
Gwa6q0cD+awzNEocVOtFcqhc12WL97ZonXA0x+q71kKdPgDQ4YdqvJDgyBq6+3uSeXDitX3K2Zko
kSibVuB46/+aOhEBrQPTrk6VZAalgWMmaoVS2YqsK1eWKZdROR9508JEMjlxUulMqpKE2SRrrwXl
l3nVNBO1YUHG7by6ykWUzdJk2xIckqr02RYVjA7Tb+F3xK6e3mmgvCjIZW9sHZOl7xbkLfGsHJ4D
B1/7yAklSjAy7nJrq+CrRDazp6eARgRF2Yvn2dL7rkxkqXTz5KqVNUMLC1Zilc8M/l0r2Cp9lO9k
6UIyrb7+PJ+8USLAyp1MA+0Zti7b1ZuHFxWQDorrUkEjBo8mc5PmsUFWsDySHeYhdG/jEl7CqLWs
rgSk3znFBwILfeFBWMspIHhipmxs11OG4Jy5TBQMLw1rwWr3aAcu3GixUFjmOTnDd4uYZQsWo9EP
UohL/i7kinChIUpUHhA=


--Boundary_(ID_BRx7yeQ8c5Lo1jYGiO/RpQ)--