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/sql_lex.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/sql_lex.cc')
-rw-r--r-- | sql/sql_lex.cc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 7fa0591ddc8..995f3702ab3 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1634,8 +1634,10 @@ void st_select_lex::print_limit(THD *thd, String *str) } } + /* - unlink first table from table lists + Unlink first table from global table list and first must outer select list + (lex->select_lex) SYNOPSIS unlink_first_table() @@ -1652,9 +1654,13 @@ TABLE_LIST *st_lex::unlink_first_table(TABLE_LIST *tables, { *global_first= tables; *local_first= (TABLE_LIST*)select_lex.table_list.first; - // exclude from global table list + /* + exclude from global table list + */ tables= tables->next; - // and from local list if it is not the same + /* + and from local list if it is not the same + */ if (&select_lex != all_selects_list) select_lex.table_list.first= (gptr)(*local_first)->next; else @@ -1663,8 +1669,9 @@ TABLE_LIST *st_lex::unlink_first_table(TABLE_LIST *tables, return tables; } + /* - link unlinked first table back + Link table back that was unlinked with unlink_first_table() SYNOPSIS link_first_table_back() @@ -1680,7 +1687,6 @@ TABLE_LIST *st_lex::link_first_table_back(TABLE_LIST *tables, TABLE_LIST *local_first) { global_first->next= tables; - tables= global_first; if (&select_lex != all_selects_list) { /* @@ -1690,8 +1696,8 @@ TABLE_LIST *st_lex::link_first_table_back(TABLE_LIST *tables, select_lex.table_list.first= (gptr) local_first; } else - select_lex.table_list.first= (gptr) tables; - return tables; + select_lex.table_list.first= (gptr) global_first; + return global_first; } /* |