diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-07-13 17:21:44 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-07-13 17:21:44 +0400 |
| commit | 51dddb3ad18b78d2f5f3ca25623bfb5dc60c5341 (patch) | |
| tree | c5fda6d5e82335ce71de89fc8afa361c9c4f4323 /sql/item_func.h | |
| parent | f60d9a3eeed1c7c6a3249ea3e629ce7b104a420b (diff) | |
| parent | 06bf59ad3381522f4f5ba272a478271c741f0049 (diff) | |
| download | mariadb-git-51dddb3ad18b78d2f5f3ca25623bfb5dc60c5341.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
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 3 |
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); |