diff options
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 20d7bffce21..78885038654 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1549,9 +1549,10 @@ longlong Item_master_pos_wait::val_int() null_value = 1; return 0; } - ulong pos = (ulong)args[1]->val_int(); + longlong pos = args[1]->val_int(); + longlong timeout = (arg_count==3) ? args[2]->val_int() : 0 ; LOCK_ACTIVE_MI; - if ((event_count = active_mi->rli.wait_for_pos(thd, log_name, pos)) == -1) + if ((event_count = active_mi->rli.wait_for_pos(thd, log_name, pos, timeout)) == -2) { null_value = 1; event_count=0; |