diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-06-12 18:41:56 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-06-12 18:41:56 +0300 |
| commit | 95ef943b9e08e30619425440a57c549aa61cb351 (patch) | |
| tree | cd6dcc472edd09fe28af2e6d1e1ef39c3ee3a949 /sql/item_func.cc | |
| parent | e53dfc6df42d83c45ec5121c98dcbcff7960beab (diff) | |
| download | mariadb-git-95ef943b9e08e30619425440a57c549aa61cb351.tar.gz | |
5.0-opt -> 5.1-opt merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 606bb5fd561..70859aeb457 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3581,10 +3581,10 @@ longlong Item_func_release_lock::val_int() } else { - DBUG_PRINT("info", ("ull->locked=%d ull->thread=%ld thd=%ld", + DBUG_PRINT("info", ("ull->locked=%d ull->thread=%lu thd=%lu", (int) ull->locked, - (long)ull->thread, - (long)thd->real_id)); + (long)ull->thread_id, + (long)thd->thread_id)); if (ull->locked && current_thd->thread_id == ull->thread_id) { DBUG_PRINT("info", ("release lock")); |