bk commit into 5.0 tree (gshchepa:1.2566) BUG#32335

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.0 repository of uchum. When uchum does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-18 00:02:55+04:00, gshchepa@stripped +3 -0
  Fixed bug #32335.
  Comparison of a BIGINT NOT NULL column with a constant arithmetic
  expression that evaluates to NULL caused error 1048: "Column '...'
  cannot be null".
  
  Made convert_constant_item() check if the constant expression is NULL
  before attempting to store it in a field. Attempts to store NULL in a
  NOT NULL field caused query errors.

  mysql-test/r/select.result@stripped, 2007-11-18 00:01:31+04:00, gshchepa@stripped +6 -0
    Added test case for bug #32335.

  mysql-test/t/select.test@stripped, 2007-11-18 00:01:30+04:00, gshchepa@stripped +11 -0
    Added test case for bug #32335.

  sql/item_cmpfunc.cc@stripped, 2007-11-18 00:01:29+04:00, gshchepa@stripped +2 -1
    Fixed bug #32335.
    1. Made convert_constant_item() check if the constant expression is NULL
       before attempting to store it in a field. Attempts to store NULL in
       a NOT NULL field caused query errors.
    
    2. Also minor bug has been fixed: the thd->count_cuted_fields value
       was not restored in case of successful conversion.

diff -Nrup a/mysql-test/r/select.result b/mysql-test/r/select.result
--- a/mysql-test/r/select.result	2007-11-14 17:26:21 +04:00
+++ b/mysql-test/r/select.result	2007-11-18 00:01:31 +04:00
@@ -4322,4 +4322,10 @@ c3
 DROP TABLE t1;
 DROP TABLE t2;
 
+CREATE TABLE t1 (c1 BIGINT NOT NULL);
+INSERT INTO t1 (c1) VALUES (1);
+SELECT * FROM t1 WHERE c1 > NULL + 1;
+c1
+DROP TABLE t1;
+
 End of 5.0 tests
diff -Nrup a/mysql-test/t/select.test b/mysql-test/t/select.test
--- a/mysql-test/t/select.test	2007-11-14 18:56:12 +04:00
+++ b/mysql-test/t/select.test	2007-11-18 00:01:30 +04:00
@@ -3661,4 +3661,15 @@ DROP TABLE t2;
 
 ###########################################################################
 
+#
+# Bug #32335: Error on BIGINT > NULL + 1 
+#
+
+CREATE TABLE t1 (c1 BIGINT NOT NULL);
+INSERT INTO t1 (c1) VALUES (1);
+SELECT * FROM t1 WHERE c1 > NULL + 1;
+DROP TABLE t1;
+
+--echo
+
 --echo End of 5.0 tests
diff -Nrup a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
--- a/sql/item_cmpfunc.cc	2007-11-10 23:58:21 +04:00
+++ b/sql/item_cmpfunc.cc	2007-11-18 00:01:29 +04:00
@@ -350,11 +350,12 @@ static bool convert_constant_item(THD *t
     thd->variables.sql_mode= (orig_sql_mode & ~MODE_NO_ZERO_DATE) | 
                              MODE_INVALID_DATES;
     thd->count_cuted_fields= CHECK_FIELD_IGNORE;
-    if (!(*item)->save_in_field(field, 1) && !((*item)->null_value))
+    if (!(*item)->is_null() && !(*item)->save_in_field(field, 1))
     {
       Item *tmp=new Item_int_with_ref(field->val_int(), *item,
                                       test(field->flags & UNSIGNED_FLAG));
       thd->variables.sql_mode= orig_sql_mode;
+      thd->count_cuted_fields= orig_count_cuted_fields;
       if (tmp)
         thd->change_item_tree(item, tmp);
       return 1;					// Item was replaced