Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

2 files changed, 6 insertions, 1 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 2738c7419ca..bfc3bb0de8b 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -616,7 +616,8 @@ public:
   Item_func_coercibility(Item *a) :Item_int_func(a) {}
   longlong val_int();
   const char *func_name() const { return "coercibility"; }
-  void fix_length_and_dec() { max_length=10; }
+  void fix_length_and_dec() { max_length=10; maybe_null= 0; }
+  table_map not_null_tables() const { return 0; }
 };
 
 class Item_func_locate :public Item_int_func
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 0c3ed32fb68..323b52b826c 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -641,7 +641,9 @@ public:
   {
      collation.set(system_charset_info);
      max_length= 64 * collation.collation->mbmaxlen; // should be enough
+     maybe_null= 0;
   };
+  table_map not_null_tables() const { return 0; }
 };
 
 class Item_func_collation :public Item_str_func
@@ -654,7 +656,9 @@ public:
   {
      collation.set(system_charset_info);
      max_length= 64 * collation.collation->mbmaxlen; // should be enough
+     maybe_null= 0;
   };
+  table_map not_null_tables() const { return 0; }
 };
 
 class Item_func_crc32 :public Item_int_func