diff options
| author | unknown <tonu@volk.internalnet> | 2001-09-30 10:47:32 +0800 |
|---|---|---|
| committer | unknown <tonu@volk.internalnet> | 2001-09-30 10:47:32 +0800 |
| commit | 691bca9ed75a7a1ed48712371da22bbb76ba9882 (patch) | |
| tree | 23320c30b5375f656671ecf64934369738776dda /sql/sql_lex.h | |
| parent | 5017da411d557ce0027f18d33d4899325188fd70 (diff) | |
| parent | 2e80fa3c5954b1cfb0d306c46ddf68d7094c5129 (diff) | |
| download | mariadb-git-691bca9ed75a7a1ed48712371da22bbb76ba9882.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0
acinclude.m4:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/structs.h:
Auto merged
Docs/manual.texi:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index ec147c38e9b..6ccb0a6b059 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -56,7 +56,7 @@ enum enum_sql_command { SQLCOM_SHOW_OPEN_TABLES, SQLCOM_LOAD_MASTER_DATA, SQLCOM_HA_OPEN, SQLCOM_HA_CLOSE, SQLCOM_HA_READ, SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_MULTI_DELETE, - SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER, + SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER }; enum lex_states { STATE_START, STATE_CHAR, STATE_IDENT, @@ -145,7 +145,8 @@ typedef struct st_lex { char *length,*dec,*change,*name; char *backup_dir; /* For RESTORE/BACKUP */ char* to_log; /* For PURGE MASTER LOGS TO */ - char* ssl_subject,*ssl_issuer,*ssl_chipher; + char* x509_subject,*x509_issuer,*ssl_cipher; + enum SSL_type ssl_type; /* defined in violite.h */ String *wild; sql_exchange *exchange; |