From 32058ba9c6365f1190e36c290ced9779f79cbdfe Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Mon, 15 Feb 2010 10:54:27 +0200
Subject: [PATCH] Addendum 2 for bug #46175: NULL read_view and consistent read
 assertion

Fixed a compilation warning.
---
 sql/sql_select.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sql_select.h b/sql/sql_select.h
index 8d3520bf9c8..b39827ef61b 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -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);
   }
 };