Commit 688c0693 authored by unknown's avatar unknown

move similar code to inline function

parent 8021b0a6
...@@ -364,7 +364,12 @@ class st_select_lex: public st_select_lex_node ...@@ -364,7 +364,12 @@ class st_select_lex: public st_select_lex_node
thr_lock_type flags= TL_UNLOCK, thr_lock_type flags= TL_UNLOCK,
List<String> *use_index= 0, List<String> *use_index= 0,
List<String> *ignore_index= 0); List<String> *ignore_index= 0);
inline void init_order()
{
order_list.elements= 0;
order_list.first= 0;
order_list.next= (byte**) &order_list.first;
}
friend void mysql_init_query(THD *thd); friend void mysql_init_query(THD *thd);
}; };
......
...@@ -1315,10 +1315,7 @@ alter: ...@@ -1315,10 +1315,7 @@ alter:
lex->col_list.empty(); lex->col_list.empty();
lex->drop_list.empty(); lex->drop_list.empty();
lex->alter_list.empty(); lex->alter_list.empty();
lex->select_lex.order_list.elements=0; lex->select_lex.init_order();
lex->select_lex.order_list.first=0;
lex->select_lex.order_list.next=
(byte**) &lex->select_lex.order_list.first;
lex->select_lex.db=lex->name=0; lex->select_lex.db=lex->name=0;
bzero((char*) &lex->create_info,sizeof(lex->create_info)); bzero((char*) &lex->create_info,sizeof(lex->create_info));
lex->create_info.db_type= DB_TYPE_DEFAULT; lex->create_info.db_type= DB_TYPE_DEFAULT;
...@@ -2902,10 +2899,7 @@ update: ...@@ -2902,10 +2899,7 @@ update:
{ {
LEX *lex= Lex; LEX *lex= Lex;
lex->sql_command= SQLCOM_UPDATE; lex->sql_command= SQLCOM_UPDATE;
lex->select_lex.order_list.elements= 0; lex->select_lex.init_order();
lex->select_lex.order_list.first= 0;
lex->select_lex.order_list.next= (byte**)
&lex->select_lex.order_list.first;
} }
opt_low_priority opt_ignore join_table_list SET update_list where_clause opt_order_clause delete_limit_clause; opt_low_priority opt_ignore join_table_list SET update_list where_clause opt_order_clause delete_limit_clause;
...@@ -2934,10 +2928,7 @@ delete: ...@@ -2934,10 +2928,7 @@ delete:
lex->sql_command= SQLCOM_DELETE; lex->sql_command= SQLCOM_DELETE;
lex->select_lex.options= 0; lex->select_lex.options= 0;
lex->lock_option= lex->thd->update_lock_default; lex->lock_option= lex->thd->update_lock_default;
lex->select_lex.order_list.elements= 0; lex->select_lex.init_order();
lex->select_lex.order_list.first= 0;
lex->select_lex.order_list.next= (byte**)
&lex->select_lex.order_list.first;
} }
opt_delete_options single_multi {}; opt_delete_options single_multi {};
...@@ -2987,11 +2978,8 @@ truncate: ...@@ -2987,11 +2978,8 @@ truncate:
LEX* lex= Lex; LEX* lex= Lex;
lex->sql_command= SQLCOM_TRUNCATE; lex->sql_command= SQLCOM_TRUNCATE;
lex->select_lex.options= 0; lex->select_lex.options= 0;
lex->select_lex.order_list.elements= 0; lex->select_lex.init_order();
lex->select_lex.order_list.first= 0; lex->lock_option= lex->thd->update_lock_default; };
lex->select_lex.order_list.next= (byte**)
&lex->select_lex.order_list.first;
lex->lock_option= current_thd->update_lock_default; };
opt_table_sym: opt_table_sym:
/* empty */ /* empty */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment