keep bk happy

1 files changed, 11 insertions, 7 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 592ef9ae3d4..ed25a471179 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1399,14 +1399,18 @@ longlong Item_master_pos_wait::val_int()
   String *log_name = args[0]->val_str(&value);
   int event_count;
   
-  if(thd->slave_thread || !log_name || !log_name->length())
-    {
-      null_value = 1;
-      return 0;
-    }
+  null_value=0;
+  if (thd->slave_thread || !log_name || !log_name->length())
+  {
+    null_value = 1;
+    return 0;
+  }
   ulong pos = (ulong)args[1]->val_int();
-  if((event_count = glob_mi.wait_for_pos(thd, log_name, pos)) == -1)
-    null_value = 1;;
+  if ((event_count = glob_mi.wait_for_pos(thd, log_name, pos)) == -1)
+  {
+    null_value = 1;
+    event_count=0;
+  }
   return event_count;
 }