bzr commit into mysql-5.1-bugteam branch (joro:3340) Bug#46175

[Georgi Kodinov]

#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);
   }
 };
 


Attachment: [text/bzr-bundle] bzr/[e-mail]