diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-05-26 22:57:08 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-05-26 22:57:08 +0300 |
| commit | e640e2e2c030d61080ce50fc7510606b8f83bc22 (patch) | |
| tree | 2664035d1938babe87144830f9e9486736d1e1ef /sql/sql_lex.h | |
| parent | 02d8b9ba56082d26b14808f6618e098c72e083fb (diff) | |
| parent | c1f3be5bb5f70e5d0376f258b79ccffa5b2d9c2b (diff) | |
| download | mariadb-git-e640e2e2c030d61080ce50fc7510606b8f83bc22.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/item_strfunc.h:
merge layout fixing
sql/sql_update.cc:
merge layout fixing
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 32a98615390..22e682fef38 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -317,6 +317,7 @@ typedef struct st_lex { bool drop_primary,drop_if_exists,local_file; bool in_comment,ignore_space,verbose,simple_alter, option_type, derived_tables; uint slave_thd_opt; + CHARSET_INFO *charset; } LEX; |