database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Cleanup of sql_derived.cc file

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-04-16 11:58:56 +02:00
parent eb056f8726
commit 8701e5b095
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sql/sql_derived.cc
View File

@@ -38,14 +38,15 @@
typedef bool (*dt_processor)(THD *thd, LEX *lex, TABLE_LIST *derived); typedef bool (*dt_processor)(THD *thd, LEX *lex, TABLE_LIST *derived);
bool mysql_derived_init(THD *thd, LEX *lex, TABLE_LIST *derived); static bool mysql_derived_init(THD *thd, LEX *lex, TABLE_LIST *derived);
bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived); static bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived);
bool mysql_derived_optimize(THD *thd, LEX *lex, TABLE_LIST *derived); static bool mysql_derived_optimize(THD *thd, LEX *lex, TABLE_LIST *derived);
bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived); static bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived);
bool mysql_derived_create(THD *thd, LEX *lex, TABLE_LIST *derived); static bool mysql_derived_create(THD *thd, LEX *lex, TABLE_LIST *derived);
bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived); static bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived);
bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived); static bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived);
bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived); static bool mysql_derived_merge_for_insert(THD *thd, LEX *lex,
TABLE_LIST *derived);
dt_processor processors[]= dt_processor processors[]=
{ {
@@ -331,6 +332,7 @@ mysql_handle_single_derived(LEX *lex, TABLE_LIST *derived, uint phases)
@return TRUE if an error occur. @return TRUE if an error occur.
*/ */
static
bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived) bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived)
{ {
bool res= FALSE; bool res= FALSE;
@@ -513,6 +515,7 @@ unconditional_materialization:
@return TRUE if an error occur. @return TRUE if an error occur.
*/ */
static
bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived) bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived)
{ {
DBUG_ENTER("mysql_derived_merge_for_insert"); DBUG_ENTER("mysql_derived_merge_for_insert");
@@ -569,7 +572,7 @@ bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived)
true Error true Error
*/ */
static
bool mysql_derived_init(THD *thd, LEX *lex, TABLE_LIST *derived) bool mysql_derived_init(THD *thd, LEX *lex, TABLE_LIST *derived)
{ {
SELECT_LEX_UNIT *unit= derived->get_unit(); SELECT_LEX_UNIT *unit= derived->get_unit();
@@ -646,7 +649,7 @@ bool mysql_derived_init(THD *thd, LEX *lex, TABLE_LIST *derived)
true Error true Error
*/ */
static
bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived) bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived)
{ {
SELECT_LEX_UNIT *unit= derived->get_unit(); SELECT_LEX_UNIT *unit= derived->get_unit();
@@ -917,6 +920,7 @@ exit:
@return TRUE if an error occur. @return TRUE if an error occur.
*/ */
static
bool mysql_derived_optimize(THD *thd, LEX *lex, TABLE_LIST *derived) bool mysql_derived_optimize(THD *thd, LEX *lex, TABLE_LIST *derived)
{ {
SELECT_LEX_UNIT *unit= derived->get_unit(); SELECT_LEX_UNIT *unit= derived->get_unit();
@@ -1028,6 +1032,7 @@ err:
@return TRUE if an error occur. @return TRUE if an error occur.
*/ */
static
bool mysql_derived_create(THD *thd, LEX *lex, TABLE_LIST *derived) bool mysql_derived_create(THD *thd, LEX *lex, TABLE_LIST *derived)
{ {
DBUG_ENTER("mysql_derived_create"); DBUG_ENTER("mysql_derived_create");
@@ -1138,7 +1143,7 @@ bool TABLE_LIST::fill_recursive(THD *thd)
@return TRUE Error @return TRUE Error
*/ */
static
bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived) bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived)
{ {
Field_iterator_table field_iterator; Field_iterator_table field_iterator;
@@ -1280,6 +1285,7 @@ err:
@return TRUE Error @return TRUE Error
*/ */
static
bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived) bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived)
{ {
DBUG_ENTER("mysql_derived_reinit"); DBUG_ENTER("mysql_derived_reinit");