From: Tor Didriksen
Date: May 3 2011 6:46am
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3358) Bug#11766327
List-Archive: http://lists.mysql.com/commits/136553
X-Bug: 11766327
Message-Id: <20110503064611.DE6A937DC@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1459917363825126048=="

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

#At file:///export/home/didrik/repo/trunk/ based on revid:vasil.dimov@stripped

 3358 Tor Didriksen	2011-05-03
      BUG#11766327 post-push fix: build break with optimized/-DMYSQL_MAINTAINER_MODE=1

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-05-02 11:51:41 +0000
+++ b/sql/sql_select.cc	2011-05-03 06:46:06 +0000
@@ -11579,7 +11579,7 @@ bool JOIN_TAB::and_with_jt_and_sel_condi
 */
 bool JOIN_TAB::and_with_condition(Item *add_cond, uint line)
 {
-  Item *old_cond= m_condition;
+  Item *old_cond __attribute__((unused))= m_condition;
   if (and_conditions(&m_condition, add_cond))
     return true;
   DBUG_PRINT("info", ("JOIN_TAB::m_condition extended. Change %p -> %p "


--===============1459917363825126048==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   jc6s4pp4a020dciy
# target_branch: file:///export/home/didrik/repo/trunk/
# testament_sha1: 640d04f2edcf772cfe6f6c6ea2e421784b4dd736
# timestamp: 2011-05-03 08:46:11 +0200
# source_branch: file:///export/home/didrik/repo/5.5/
# base_revision_id: vasil.dimov@stripped\
#   1596ds1clw32j6du
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWflDw34AAYVfgAAQWHP//3an
viC////wUAO02hLuae9cMuGSRqehomGlNlP1TymmJkGQaaZMgA0EohT0YjJkTSjCNqYEDTQNGjI0
aBJIApiYg0npDJpDJiAAAACIo9NTCPU00whpoNDJkwmmTEYh6QEqIjRptRoyAZPUDT1AAAAAMvNq
vd5HXu0zTOmmAG3Y1uLGaq7ur2RVVPx9k/brlImDVgwfOLaOjdw9rV56VxqzIAyZ7nUSxNCkB0+l
OS+m6GwzDlBHvo6g+7GC++B2H1GJizeSLyZi2KmSBMEUILUtFUohDhDfQXIQ4y63COEoMmNAooID
2IrlxH1oLQ9hgl6o/e8gpcIWLcjhCME6Nj2yetbSmlveRPCVA71ep7IeGnO2hOQ/8qzIxNvZx3yI
6J3Dk+0Q+SyFgMG6j7zeYuCyCLKwqLQw/gNU/i1x3Eq7zTSN10CeDoEHaS9oNQa/OY+7xYijnEsz
cYFq2it/Z++cWd4irC6ZOL+lVbdPW5xUZd9g+lRNnqFhRO3xkJ+17NZ4xUXXBP4mq+S3ieeJdcHE
V5Ot2yh0loXlapu0cwmLA3pnonMpwZaVWk40WJiRJ7qitSVwq5QJEDdWehwU06sGi1WJOTSaBMJT
adsV2eg2eHdru2Dpu+DXSIn0RRC+WGTEMBvKXRZvJbj2gh7qDF6Ax8l6mV8qR71TEatuXagGvV2l
YyA9cJjTPp47t5IZLqmhAg1z4YZ/OQjQai63ANgwioVwB3EeNmm8PHJ2AbDa/aDPRwNAg33NcC9S
JHqVEjDmPuXqvM4m2rjrIFluNVNM9NX3b5CrS9LnCGKsSACMpvUWkGugJGu6gZcbG5UUqRgGbM+E
usbkEwxUpwsTWLOaqJE+1CUusVWhLhoKGupi2PtDAFlSjkKEkJfFjCMeFfbrBys0SE8iQQPKhhXG
JbB1ngUS5MJJP0dCfLiRG3MHgcZim+yPR6aWCfjuzbEvUeCCctsVUEOSpJEYWUxDVCbEmu7aLALE
HhKIwfB9oILy6yTmsSGIq3Ln7tE1KiR0dKrqsMW3T6nqUidYNJmTJNWToA5w7LT20+xVEmUdg9Xa
Z1w/uIKaGO6Rh9epL/JDB2XLoem2XhgnirkzKBwJdHEnPtFlStMuq0Kw52SzTJL9D0U43EZY8uQE
Fb1xjbOUGU00E4R1H2gnSBRtmDqpxgyBguR2fpYKphkskJXTojW+I5afnHacttIz3zNX5mYrvZkF
UmroMS+SmW0ODjPwsrfLteYq5OXkMwuNq85uz1SXU4xYZm4DtrKNg8f4u5IpwoSHyh4b8A==


--===============1459917363825126048==--