diff options
author | unknown <monty@hundin.mysql.fi> | 2001-06-28 10:49:16 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-06-28 10:49:16 +0300 |
commit | 53ef31ce5cf9e29327c4506cb21e0de5ad41c831 (patch) | |
tree | 739c3565fe5148ff499bf5daae2a711768b66e2f /sql/sql_lex.h | |
parent | 237b4bed6046e39a7118b834db6952964712eb7a (diff) | |
download | mariadb-git-53ef31ce5cf9e29327c4506cb21e0de5ad41c831.tar.gz |
Changed safe_mysqld -> mysqld_safe
Added some alias to SHOW commands
Prepare for dynamic changing of MySQL variables
man/Makefile.am:
Changed safe_mysqld -> mysqld_safe
man/isamchk.1:
Changed safe_mysqld -> mysqld_safe
man/isamlog.1:
Changed safe_mysqld -> mysqld_safe
man/mysql.1:
Changed safe_mysqld -> mysqld_safe
man/mysql_zap.1:
Changed safe_mysqld -> mysqld_safe
man/mysqlaccess.1:
Changed safe_mysqld -> mysqld_safe
man/mysqladmin.1:
Changed safe_mysqld -> mysqld_safe
man/mysqld.1:
Changed safe_mysqld -> mysqld_safe
man/mysqld_multi.1:
Changed safe_mysqld -> mysqld_safe
man/mysqld_safe.1:
Changed safe_mysqld -> mysqld_safe
man/mysqldump.1:
Changed safe_mysqld -> mysqld_safe
man/mysqlshow.1:
Changed safe_mysqld -> mysqld_safe
man/perror.1:
Changed safe_mysqld -> mysqld_safe
man/replace.1:
Changed safe_mysqld -> mysqld_safe
man/which.2:
Changed safe_mysqld -> mysqld_safe
myisam/mi_search.c:
Fixed bug when using packed keys.
scripts/Makefile.am:
Changed safe_mysqld -> mysqld_safe
scripts/make_binary_distribution.sh:
Changed safe_mysqld -> mysqld_safe
scripts/mysql_install_db.sh:
Changed safe_mysqld -> mysqld_safe
scripts/mysqld_multi.sh:
Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe-watch.sh:
Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe.sh:
Changed safe_mysqld -> mysqld_safe
sql/lex.h:
Addex SHOW INDEXES as an alias for SHOW INDEX
sql/sql_class.cc:
Prepare for dynamic changing of MySQL variables
sql/sql_lex.h:
Prepare for dynamic changing of MySQL variables
sql/sql_yacc.yy:
Some changes to SHOW commands.
support-files/binary-configure.sh:
Changed safe_mysqld -> mysqld_safe
support-files/mysql-max.spec.sh:
Changed safe_mysqld -> mysqld_safe
support-files/mysql-multi.server.sh:
Changed safe_mysqld -> mysqld_safe
support-files/mysql.server.sh:
Changed safe_mysqld -> mysqld_safe
support-files/mysql.spec.sh:
Changed safe_mysqld -> mysqld_safe
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index a7b7f75f4a2..e585ec65191 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -120,6 +120,18 @@ typedef struct st_select_lex { } SELECT_LEX; +class Set_option :public Sql_alloc { +public: + const char *name; + Item *item; + uint name_length; + bool type; /* 1 if global */ + Set_option(bool par_type, const char *par_name, uint length, + Item *par_item) + :name(par_name), item(par_item), name_length(length), type(par_type) {} +}; + + /* The state of the lex parsing. This is saved in the THD struct */ typedef struct st_lex { @@ -143,6 +155,7 @@ typedef struct st_lex { List<create_field> create_list; List<Item> *insert_list,field_list,value_list; List<List_item> many_values; + List<Set_option> option_list; SQL_LIST proc_list, auxilliary_table_list; TYPELIB *interval; create_field *last_field; @@ -167,7 +180,7 @@ typedef struct st_lex { uint grant,grant_tot_col,which_columns; thr_lock_type lock_option; bool drop_primary,drop_if_exists,local_file; - bool in_comment,ignore_space,verbose,simple_alter; + bool in_comment,ignore_space,verbose,simple_alter, option_type; } LEX; |