From: Georgi Kodinov
Date: February 15 2010 8:55am
Subject: bzr commit into mysql-5.1-bugteam branch (joro:3340) Bug#46175
List-Archive: http://lists.mysql.com/commits/100328
X-Bug: 46175
Message-Id: <201002150855.o1F8tARL001367@magare.gmz>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0106492696299363565=="

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

#At file:///home/kgeorge/mysql/work/B46175-5.1-bugteam/ based on revid:davi.arnaut@stripped

 3340 Georgi Kodinov	2010-02-15
      Addendum 2 for bug #46175: NULL read_view and consistent read assertion
      
      Fixed a compilation warning.

    modified:
      sql/sql_select.h
=== modified file 'sql/sql_select.h'
--- a/sql/sql_select.h	2010-02-11 17:41:53 +0000
+++ b/sql/sql_select.h	2010-02-15 08:54:27 +0000
@@ -769,7 +769,7 @@ protected:  
       if ((res= item->save_in_field(to_field, 1)))
       {       
         if (!err)
-          err= res;
+          err= res < 0 ? 1 : res; /* 1=STORE_KEY_FATAL */
       }
       /*
         Item::save_in_field() may call Item::val_xxx(). And if this is a subquery
@@ -779,7 +779,7 @@ protected:  
         err= 1; /* STORE_KEY_FATAL */
     }
     null_key= to_field->is_null() || item->null_value;
-    return ((err < 0 || err > 2) ? STORE_KEY_FATAL : (store_key_result) err);
+    return (err > 2 ? STORE_KEY_FATAL : (store_key_result) err);
   }
 };
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: joro@stripped
# target_branch: file:///home/kgeorge/mysql/work/B46175-5.1-bugteam/
# testament_sha1: 4d2e156148e62db5a55f104db4bcb81778ef7700
# timestamp: 2010-02-15 10:55:10 +0200
# base_revision_id: davi.arnaut@stripped\
#   y7zvj1okm33nypoi
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZVzPGwAAavfgEEQWXP///ON
niC////wUAPh5lLdMitbVwSSjJGhpk0yZI9IbQKeRMTTTRmkybTTUElKbIjaJ6htCI0xDQADIAAa
ASgoaap5NMo2oMagDNQAADQNAOYBMBMjACMTEwmEwQ0xNMBJETRHojExFP0mSGnpAD1GmQAAJHE3
pPYYubfy8S7kMl1QDKVr1GGFwiqy5zu5nPnE48vmiPp3U5T9TMMxbd8w4Pva5rafaiJriiGaV3Dg
9+CfBv4tcm3w2cs9/4rIme0bZJ+2V3uwsOeey23V/n43NW1GFKCGiERpzMHfRTtdIOiEcJNvVVjp
FHnLHj1sijx5FlSJVpxKHor5IarbIDODs7NWbEhxEBx3EOhvLeXWixHJMDl2wmE2DRpEYMFKnXOH
GyWskvcToXURFbmlfqIZsQ3UUibQUFOyQYtixRtsYyYmqkoSLkRExhkcQiKvgY+ocG6LZd0ChgZA
YTJzJlEsJVfHTPlFMV+xTp9Ol1exMkSmJyBArOqBn2UZEHIyP4UWDoUCtoVBOQvy4z9tFgyJpTnK
xhWXsdJVaPlvQHMjU9VEpKdDSdo904mQGqdpr7cBeK1cHTmgiilYHQby7ktO64nkKycnGMCzGktK
NtpaTIgVSaEGYkvRsSJ8JgB/d+Nxe8VawvyxVrlrukEDmydbIgdm7THU8rEKmeRzbKEUTSaCuFas
oxoX3Po/R6WKfg8/yGQ+TzhiOJxwn0MZFTOlBVV6+Cic1kjw2mgWw1n2P7uNUylNQb4ZyZ0sscYv
Rdz9qpvKhdtPgKE74SAxGDy1Vv1on7TmZmZwxO8UHdVqnJzakWKoIyfnca+JEoXEin0iqv7TQYky
05RpyOZNb8nTs9nATlxlHUX05jzLn7LcBa8GLXeQ9csHOdSu+vobFlvv+EyOTqHxXPrRxzD2LxlK
a1C9kFA++poq86qKBiGnKRmH41Tntk3HQ4NeQ253wC1CgmK6zF9XdPZaQda0nSDTd2yoMe22+mug
Ns6PiKJQS8Zv45BQb/EGqurr78ZU4syVYDcvq/CK41+53pugVhlv1orXXImXMi1QH3NOg045IbyR
hFYoYUUr2qiy6MYYh47pmd4sYEQVEyEiZ4kwW4xIOO2XHDsOBzrqHshk8wppYgPZtGgY7FUhRiNU
xDSjWT8KNTr9gTirbJnSFuJnnmqaCoOl+xV74aNA2WMIl+AOYow2zXNab4zSBSuscEBGG02Xyaqo
8IwVlfhpDzxA3U3BUKLDLIdUDNgSW54uQOIFbyTOVrcqk5Us8Q5H/kQeWi+XeTM8piSbIWLM1ewT
3W5Rox8yJxSMWG/IU89O4b95rAUHqWmhQ6nLJfA0LSK4sumOcTyuwqLqsxMyq5JJnuqJExOHml13
WUVr/F3JFOFCQlXM8bA=


--===============0106492696299363565==--