Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

b21e89bb · serg@serg.mysql.com · ce935275 · 94681d0f · b21e89bb
Commit b21e89bb authored Feb 06, 2001 by serg@serg.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

sql/item_func.cc sql/item_func.cc +4 -5

No files found.
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1867,12 +1867,11 @@ err:

 double Item_func_match::val()
 {
-  /* If called uninitialized we should return neither NULL nor 0 (important
-     for const_tables) so, let's return -1, which is obviously incorrect
-     for normal operation, and could be easily spotted */
-
  if (ft_handler==NULL)
-    return -1.0;
+    init_search(1);
+
+  if (null_value=(ft_handler==NULL))
+    return 0.0;

  if (join_key)
  {