diff options
author | unknown <bell@sanja.is.com.ua> | 2004-04-10 01:14:32 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-04-10 01:14:32 +0300 |
commit | 8ab58393c5c9732c032faac3f0d04a4536e5562b (patch) | |
tree | 9b43a6ee50851ff9a0c1df227464a4eb032802e2 /sql/set_var.cc | |
parent | 2384ed8c011a6df7091bb758e500cca89c499c7e (diff) | |
download | mariadb-git-8ab58393c5c9732c032faac3f0d04a4536e5562b.tar.gz |
after review PS fixes
sql/item_cmpfunc.cc:
merged in one if
sql/mysql_priv.h:
removed unused paremeter of check_one_table_access
declaration of new function for SP share code
sql/set_var.cc:
function descriotion added
unneeded parantses removed
sql/sql_acl.cc:
new parameter to limit number of checked tables for check_grant
sql/sql_acl.h:
new parameter to limit number of checked tables for check_grant
sql/sql_delete.cc:
preparation moved in separate function
sql/sql_insert.cc:
preparation moved in separate function
sql/sql_lex.cc:
comment style fixed
unneeded assignment removed
sql/sql_parse.cc:
new parameter to limit number of checked tables for check_grant
table list manipulation removed (because of above)
new precheck function
sql/sql_prepare.cc:
function rewrited to shere code with sql_prepare.cc
flow control fixed
sql/sql_show.cc:
new parameter to limit number of checked tables for check_grant
sql/sql_update.cc:
preparation moved in separate function
sql/table.h:
flag renamed
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r-- | sql/set_var.cc | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 54f2d75d6a8..9250177e721 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2529,6 +2529,18 @@ int set_var::check(THD *thd) } +/* + Check variable, but without assigning value (used by PS) + + SYNOPSIS + set_var::light_check() + thd thread handler + + RETURN VALUE + 0 ok + 1 ERROR, message sent (normally no variables was updated) + -1 ERROR, message not sent +*/ int set_var::light_check(THD *thd) { if (var->check_type(type)) @@ -2538,7 +2550,7 @@ int set_var::light_check(THD *thd) var->name); return -1; } - if ((type == OPT_GLOBAL && check_global_access(thd, SUPER_ACL))) + if (type == OPT_GLOBAL && check_global_access(thd, SUPER_ACL)) return 1; if (value && (value->fix_fields(thd, 0, &value) || value->check_cols(1))) @@ -2574,6 +2586,18 @@ int set_var_user::check(THD *thd) } +/* + Check variable, but without assigning value (used by PS) + + SYNOPSIS + set_var_user::light_check() + thd thread handler + + RETURN VALUE + 0 ok + 1 ERROR, message sent (normally no variables was updated) + -1 ERROR, message not sent +*/ int set_var_user::light_check(THD *thd) { /* |