in 4.1 DATABASE() may be NULL

0452d59d · serg@serg.mylan · 3362bbf8 · 0452d59d
Commit 0452d59d authored Jul 16, 2004 by serg@serg.mylan
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/item_strfunc.h sql/item_strfunc.h +3 -2

No files found.
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -359,9 +359,10 @@ class Item_func_database :public Item_str_func
 public:
  Item_func_database() { collation.set(system_charset_info,DERIVATION_IMPLICIT); }
  String *val_str(String *);
-  void fix_length_and_dec() 
-  { 
+  void fix_length_and_dec()
+  {
    max_length= MAX_FIELD_NAME * system_charset_info->mbmaxlen;
+    maybe_null=1;
  }
  const char *func_name() const { return "database"; }
 };