diff options
| author | unknown <monty@mysql.com> | 2004-04-12 03:26:32 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-04-12 03:26:32 +0300 |
| commit | 0ba6cb48d84f1ff951d09871a96be6cdef3f2c3c (patch) | |
| tree | 7e3b167c5ba793cca125cc8838e0c5974d2eab95 /sql/sql_lex.cc | |
| parent | 97eddaaf6de63886bbdc2b7a63c62618f427321a (diff) | |
| download | mariadb-git-0ba6cb48d84f1ff951d09871a96be6cdef3f2c3c.tar.gz | |
Added missing return statement
sql/sql_delete.cc:
Added missing return
sql/sql_lex.cc:
Comment fixes
sql/sql_parse.cc:
Comment fixes
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 995f3702ab3..e0e8fed29c8 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1636,17 +1636,21 @@ void st_select_lex::print_limit(THD *thd, String *str) /* - Unlink first table from global table list and first must outer select list - (lex->select_lex) + Unlink first table from global table list and first table from outer select + list (lex->select_lex) SYNOPSIS unlink_first_table() - tables - global table list - global_first - save first global table passed using this parameter - local_first - save first local table passed using this parameter + tables Global table list + global_first Save first global table here + local_first Save first local table here + + NORES + global_first & local_first are used to save result for link_first_table_back RETURN global list without first table + */ TABLE_LIST *st_lex::unlink_first_table(TABLE_LIST *tables, TABLE_LIST **global_first, @@ -1655,16 +1659,15 @@ 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 */ - if (&select_lex != all_selects_list) - select_lex.table_list.first= (gptr)(*local_first)->next; - else - select_lex.table_list.first= (gptr)tables; + select_lex.table_list.first= ((&select_lex != all_selects_list) ? + (gptr) (*local_first)->next : + (gptr) tables); (*global_first)->next= 0; return tables; } @@ -1675,9 +1678,9 @@ TABLE_LIST *st_lex::unlink_first_table(TABLE_LIST *tables, SYNOPSIS link_first_table_back() - tables - global table list - global_first - save first global table - local_first - save first local table + tables Global table list + global_first Saved first global table + local_first Saved first local table RETURN global list |