cleanup: sort and reorder %union elements in sql_yacc.yy

1 files changed, 49 insertions, 43 deletions

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 8a56a86f1bf..ea2a3492e43 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -945,65 +945,71 @@ bool LEX::set_bincmp(CHARSET_INFO *cs, bool bin)
   ulong ulong_num;
   ulonglong ulonglong_number;
   longlong longlong_number;
+
+  /* structs */
   LEX_STRING lex_str;
-  LEX_STRING *lex_str_ptr;
   LEX_SYMBOL symbol;
-  Table_ident *table;
-  char *simple_string;
+  struct sys_var_with_base variable;
+  struct { int vars, conds, hndlrs, curs; } spblock;
+
+  /* pointers */
+  CHARSET_INFO *charset;
+  Condition_information_item *cond_info_item;
+  DYNCALL_CREATE_DEF *dyncol_def;
+  Diagnostics_information *diag_info;
   Item *item;
-  Item_param *item_param;
   Item_num *item_num;
+  Item_param *item_param;
+  Key_part_spec *key_part;
+  LEX *lex;
+  LEX_STRING *lex_str_ptr;
+  LEX_USER *lex_user;
+  List<Condition_information_item> *cond_info_list;
+  List<DYNCALL_CREATE_DEF> *dyncol_def_list;
   List<Item> *item_list;
+  List<Statement_information_item> *stmt_info_list;
   List<String> *string_list;
+  Statement_information_item *stmt_info_item;
   String *string;
-  Key_part_spec *key_part;
   TABLE_LIST *table_list;
-  udf_func *udf;
-  LEX_USER *lex_user;
-  struct sys_var_with_base variable;
-  enum enum_var_type var_type;
-  Key::Keytype key_type;
-  enum ha_key_alg key_alg;
-  enum enum_field_types field_type;
-  enum Field::geometry_type geom_type;
-  handlerton *db_type;
-  enum row_type row_type;
-  enum ha_rkey_function ha_rkey_mode;
-  enum enum_tx_isolation tx_isolation;
-  enum Cast_target cast_type;
-  enum Item_udftype udf_type;
-  enum ha_choice choice;
-  CHARSET_INFO *charset;
-  thr_lock_type lock_type;
-  interval_type interval, interval_time_st;
-  timestamp_type date_time_type;
-  st_select_lex *select_lex;
+  Table_ident *table;
+  char *simple_string;
   chooser_compare_func_creator boolfunc2creator;
-  class sp_condition_value *spcondvalue;
-  struct { int vars, conds, hndlrs, curs; } spblock;
-  class sp_name *spname;
-  class sp_label *splabel;
-  LEX *lex;
   class my_var *myvar;
+  class sp_condition_value *spcondvalue;
   class sp_head *sphead;
+  class sp_label *splabel;
+  class sp_name *spname;
   class sp_variable *spvar;
+  handlerton *db_type;
+  st_select_lex *select_lex;
   struct p_elem_val *p_elem_value;
-  enum index_hint_type index_hint;
-  enum enum_filetype filetype;
+  udf_func *udf;
+
+  /* enums */
+  enum Cast_target cast_type;
+  enum Condition_information_item::Name cond_info_item_name;
+  enum enum_diag_condition_item_name diag_condition_item_name;
+  enum Diagnostics_information::Which_area diag_area;
+  enum Field::geometry_type geom_type;
   enum Foreign_key::fk_option m_fk_option;
+  enum Item_udftype udf_type;
+  enum Key::Keytype key_type;
+  enum Statement_information_item::Name stmt_info_item_name;
+  enum enum_field_types field_type;
+  enum enum_filetype filetype;
+  enum enum_tx_isolation tx_isolation;
+  enum enum_var_type var_type;
   enum enum_yes_no_unknown m_yes_no_unk;
+  enum ha_choice choice;
+  enum ha_key_alg key_alg;
+  enum ha_rkey_function ha_rkey_mode;
+  enum index_hint_type index_hint;
+  enum interval_type interval, interval_time_st;
+  enum row_type row_type;
   enum sp_variable::enum_mode spvar_mode;
-  Diag_condition_item_name diag_condition_item_name;
-  Diagnostics_information::Which_area diag_area;
-  Diagnostics_information *diag_info;
-  Statement_information_item *stmt_info_item;
-  Statement_information_item::Name stmt_info_item_name;
-  List<Statement_information_item> *stmt_info_list;
-  Condition_information_item *cond_info_item;
-  Condition_information_item::Name cond_info_item_name;
-  List<Condition_information_item> *cond_info_list;
-  DYNCALL_CREATE_DEF *dyncol_def;
-  List<DYNCALL_CREATE_DEF> *dyncol_def_list;
+  enum thr_lock_type lock_type;
+  enum enum_mysql_timestamp_type date_time_type;
 }
 
 %{