From: Tor Didriksen
Date: October 25 2010 3:08pm
Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3269) Bug#45288
List-Archive: http://lists.mysql.com/commits/121830
X-Bug: 45288
Message-Id: <20101025150831.877FA3723@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4038112641336555799=="

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

#At file:///export/home/didrik/repo/5.5-bugteam/ based on revid:horst.hunger@stripped

 3269 Tor Didriksen	2010-10-25
      Bug#45288: pb2 returns a lot of compilation warnings
      
      sql/sql_lex.h:1437: warning: control reaches end of non-void function
     @ sql/sql_lex.h
        Make compiler happy, by adding a return statement.

    modified:
      sql/sql_lex.h
=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2010-10-06 14:34:28 +0000
+++ b/sql/sql_lex.h	2010-10-25 15:08:27 +0000
@@ -1389,6 +1389,7 @@ public:
     STMT_ACCESS_TABLE_COUNT
   };
 
+#ifndef DBUG_OFF
   static inline const char *stmt_accessed_table_string(enum_stmt_accessed_table accessed_table)
   {
     switch (accessed_table)
@@ -1422,7 +1423,10 @@ public:
         DBUG_ASSERT(0);
       break;
     }
+    MY_ASSERT_UNREACHABLE();
+    return "";
   }
+#endif  /* DBUG */
                
   #define BINLOG_DIRECT_ON 0xF0    /* unsafe when
                                       --binlog-direct-non-trans-updates


--===============4038112641336555799==
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\
#   c3ugwli8504k0d5g
# target_branch: file:///export/home/didrik/repo/5.5-bugteam/
# testament_sha1: bfd36ffe445f7e30d1ddf05ed481b50923f33098
# timestamp: 2010-10-25 17:08:31 +0200
# base_revision_id: horst.hunger@stripped\
#   bvlz7saqvjwx88p3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRMUk0IAAcPfgEAQWHf//3/H
niC////wUAQjzpVTaq9DoENEE00ptTwjEwo0yYmmmQaGTGpmRNA5piZMmjCYJiaYBMAhgjAjAMkN
NIaBTNQZNGgAAAAAAGqn6p5IYhoxND1GmTTENDQBpoAyGgkkQaABMECMSbRR6ajIPSDT1GRtRGo3
6cVEKa/kV1SWTNSJjFUjIwQa64J1HVElJxgjGx1mZc2tpmYDm0CC1bYEBBjuwsOJaFtwQWzX/3Ev
BkcRwcrae+Zsilqe4suqEJhaJD4S3rtyjQTykED7BqXo8syZXysBC9w7lyFhrvhVyVGzeoQypozp
kTJb0vsKC5YGmBCybDdKBzatRj+OxzhF6cCYbFklgJ/u7meJlQEa5i92eUamshECJsQBOzUXAHEM
uR4m+F9EorSqnV6tso8MpvpRWKTyxPv7dS7X4LSdi2rLmOV+7LdvoESmRrLYqnOQTuWDWiYzkLnm
DlPEFmuwrjuuZT1QI7FvLLWFZik7MEGMrbjU1AssgNBC8pddpvmgQdFAppWiLvDEk45/XVsxT4m6
TQVIo0FEnBf7ob0+eWq83q42OiD+lYmy+wRwSFdF50mZ1si9sWea5KXk1zOvnzmC3DNTb0cqaYbl
1XstFRTLxgLS4Ud40GJ1tmrotzMx5GoUsp1n4wqP1GuM3AWCfAmW0b07rlyzFSPc5MT0jfJJFb1E
BJxg6SOEYoA0klh0bI1eGejeEzOlxYMpO6fLl/K6iZnurC8qYS+7XeW/l+C3LxuKh5wPQPsaGc+l
nSKc5zAzgrM8ZoOD0817uvU8fH4L4/mWfx1ArfaPDKEWF8d8qunR8vkZw6pEr2mqVx1Rest9ARqw
bwJtIKlmsLBXh27ShYKFbN2EZcZxmA3JF1y2SSUO2fps4P5Zw9BM0FdwmT5dJVZIrpDiIkVClhAT
x1tIhfG27Q6hMa8mF5IxIeDAMeNc7zKZ0Sba2wkL8aoYND6ur3gcfnfi3smWNuc1an27NaFOlOKC
MeygXKTQMEFjEB3Ug8QJsKC19ecJCtTEDA4JUGIPk7oJzlOtFW+TsYXQLM9HvgFNUUTk5Wol4sZT
C9VuK9vXzD9+aT5J3ro8DLJDRmHeF001R9OGMkxmGIc3YvXctewTcZcw7ANdq3BSFLl6RCktqTik
BgnF3+Qq7+3bXgrhEjcE66wqMOEvKWQeQ7snvmnc+Jiso5IEpYtEVYCpzPAgUzMJYODAqzi4yFkC
rC12IlKt7LF9ijPw3JfYBgqXiub1pZbOHgrtGYGiI+Hknk+mr4RX4+CxVaCOCnVOj3JOEwL32RI5
OKuxxLy9/eBOrcChRuzJbJVMwdvbPFLeXp/UC6AMUdoNAtborV6+rQmxc96iKTomykDmmzx2GxPz
f/hENnHfOcn+bT10nZFaXjRfdWFiIMtcF4retm349u8XWlN1TtFhrYnVh3qdcJVuO+YT17KAmWCc
oY9zHFVZj5LD/i7kinChICYpJoQ=


--===============4038112641336555799==--