summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2004-03-15 22:17:31 +0200
committerbell@sanja.is.com.ua <>2004-03-15 22:17:31 +0200
commit6eb403cfdc03a1ca73d0a7c31fd193ba3d5c167c (patch)
tree5ef82c6f37b4c0332a71d3f7cd9840ed3b6c0bb4 /sql/item_func.h
parentb4bb6b7f779f44582dcd5a89cabd491021b26546 (diff)
parent36120d420a56c336a4fbf3069d91455e4118798b (diff)
downloadmariadb-git-6eb403cfdc03a1ca73d0a7c31fd193ba3d5c167c.tar.gz
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 55b6b0f54fd..0071b3c5495 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -863,9 +863,9 @@ public:
** User level locks
*/
-class ULL;
+class User_level_lock;
void item_user_lock_init(void);
-void item_user_lock_release(ULL *ull);
+void item_user_lock_release(User_level_lock *ull);
void item_user_lock_free(void);
class Item_func_get_lock :public Item_int_func