summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorkroki/tomash@moonlight.intranet <>2006-07-13 17:21:44 +0400
committerkroki/tomash@moonlight.intranet <>2006-07-13 17:21:44 +0400
commita3ea06db41b0969c04684ec7146d16a5925da775 (patch)
treec5fda6d5e82335ce71de89fc8afa361c9c4f4323 /sql/item_func.h
parentb823c2f601e377c1ac746f1ecf5e233d8a952e5c (diff)
parent4272d1efc3a7a106b50f47939d823ee256002f9d (diff)
downloadmariadb-git-a3ea06db41b0969c04684ec7146d16a5925da775.tar.gz
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18630
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 2ca4be9f3f2..304aeb8aef1 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1465,8 +1465,7 @@ public:
{ context= (Name_resolution_context *)cntx; return FALSE; }
void fix_length_and_dec();
- bool find_and_check_access(THD * thd, ulong want_access,
- Security_context **backup);
+ bool find_and_check_access(THD * thd);
virtual enum Functype functype() const { return FUNC_SP; }
bool fix_fields(THD *thd, Item **ref);