diff options
| author | sasha@mysql.sashanet.com <> | 2002-01-19 22:46:25 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2002-01-19 22:46:25 -0700 |
| commit | 684f13ef4c20cc1843c615ee17a8013f65617442 (patch) | |
| tree | 254bb1b067e503a819145fff488d83709bf9c798 /sql/item_func.cc | |
| parent | d7ad2cbe5b55d422affe8d180d0cc8dab1c518e1 (diff) | |
| parent | 56129ce634088b51dd60381711519c9125e8df72 (diff) | |
| download | mariadb-git-684f13ef4c20cc1843c615ee17a8013f65617442.tar.gz | |
Ugly merge! But I am not done yet - there are a number of things I need to fix
before I can push
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index b59aceb512e..209fbea1674 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1453,11 +1453,13 @@ longlong Item_master_pos_wait::val_int() return 0; } ulong pos = (ulong)args[1]->val_int(); - if ((event_count = glob_mi.wait_for_pos(thd, log_name, pos)) == -1) + LOCK_ACTIVE_MI; + if ((event_count = active_mi->rli.wait_for_pos(thd, log_name, pos)) == -1) { null_value = 1; event_count=0; } + UNLOCK_ACTIVE_MI; return event_count; } |