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

--===============3833388189768804436==
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 14:11:42 +0000
@@ -1422,6 +1422,8 @@ public:
         DBUG_ASSERT(0);
       break;
     }
+    MY_ASSERT_UNREACHABLE();
+    return "";
   }
                
   #define BINLOG_DIRECT_ON 0xF0    /* unsafe when


--===============3833388189768804436==
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\
#   x233zafeoxedlvoy
# target_branch: file:///export/home/didrik/repo/5.5-bugteam/
# testament_sha1: 95af687fbc7e981f9977092cf6e930349bd50221
# timestamp: 2010-10-25 16:11:46 +0200
# base_revision_id: horst.hunger@stripped\
#   bvlz7saqvjwx88p3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWD21MEAAZrfgEAQWGf//35H
HiC////wUAP9eA87nFBoAamVT8EyTJGepGjeqD9UzUNADHqGo9J6gcwAEyYAEwmCYQwBGACNUabU
npo1APUyA0NAAAAAA00gIpvVPUwJmhBgCNMjARkAElBDQ0AmmJoTTTUzSh4mk2o0MTT0i+hlTbPH
9HKl/SzGu0Xa0KABNHtZbpuMaaoQiHVY9YEkJ2C5K3GHqioksuxzyRn0SWe9e2gp46MSVJdazKkV
kFHmZ/eOFc+7xKHtFj6SU98tK+oi3Tercc5qOSoyzUMhT4tjtjKmJZpe4oLCNxM2bjILiz9VsHVs
YIsTULBpg5JM1HfWXuVITLGYhB/Oh9SOMol2ZpoLYaaVi5OfjRPCwfr8XKIm3Cgts/3pp8evZj5K
mphXlTUUmLlZjqwUm+IjXkKQkVTEF07xby3e6Yc1YNVrw0LLGKaEVlwE+JiNjGMMX7CUY2ufZQtg
olJcxAajHJ+6JTINKyseeV46WeRvjabv9rZE020IJr5OCr/Eu5PbSSJiCR9FdBE0qqyN9tRwyWkP
LYpUtCyYuS3BFDFM6KJSOLKQXR+FoGbXHWzXoEhQpPwqZPRHAYVI8RKjRAwyakTkpPcllM4lojfq
Xr0pMKgnsYXzxMUdWcGiCo1YlQ95AY0mw9JDN4ZcEAcTb8ZGKQixG3zvwPBECmnvOvf9sut7d1H5
wpZS5dXC++qBQIDuCLbFCAVpEgYUBGrSjRYXuj1bPtA8K3yCtJAxhJhfJbMq4o9vmfAg9u2jw53y
wesOvkS5fyGXUNJPj5lPstOP8Rw36DGAaJD7FVLLO2+3c0rlp9WzLSCb6+0irlWNFVJ8zbelqSyi
oQbW/SlI9t+wtg59kEaOx+GRHSGgUc5Z87ZVu2BD+OJtwvLE6O5iy6bjr6wB237WflMWAst+k+io
4Y74qlKgUE7gaLDaVl7Nl3YxN5C4S2F347uLNO7gNHDG9GUiYoLRVukv6BZlm50Api97U1Vqbgwv
/xale7r6B76pOlncNAxxQx5d0CyEIn33YSzmIYBybk5c1may4hwAyzWgUhS1fR4pbIppEBgUC6VW
8c6tor1cImZqm3WFRhrNxmlHEPDaxk06saRQhUtRDQ6Z7oAPIDEN14hZUQCOgqKkit6kmLG4iUy1
YsXWKQ9dyXuAwKl4Lk5aWXCsFdEOivzYwGPJuHenEc9HQfsy71kq0EkFQo2uak0TAX7WPR2tKuTS
bt8+YFCtwKVI3MmsmU7A5cqHzXl6d8ALoAwp7QZAtZ3K1fL7MhPi1zk8idEzbKHcmZY7DYnZO8x4
zKS+g5u9GUVxOx9peMf1rCxEGLTBeq3rZu+XLrSmdU3JX51ptQd6nW/QUFuO9q/KgKUTVgtRPTCf
a06NaxlKq5izJIWL/xdyRThQkGD21ME=


--===============3833388189768804436==--