diff options
| author | unknown <jani@hynda.mysql.fi> | 2002-04-03 13:33:25 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2002-04-03 13:33:25 +0300 |
| commit | 38cd4fdeb2d37e287d2e02dacdf50e31e13a828e (patch) | |
| tree | 283f5daacaba26ce91c294cad2eb8464a3b56af6 /client/client_priv.h | |
| parent | 4bd34624b9e82c0039ca31f7ab865a177b133b33 (diff) | |
| parent | a2e75474b51e41446af02081ba2917f0f296aee2 (diff) | |
| download | mariadb-git-38cd4fdeb2d37e287d2e02dacdf50e31e13a828e.tar.gz | |
Merged in some changes made to MySQL clients by other
developers before pushing my_getopt.
client/mysqladmin.c:
Auto merged
mysys/my_getopt.c:
Auto merged
sql/mysqld.cc:
Auto merged
client/client_priv.h:
Merged in previous changes for new client_priv.h (my_getopt)
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index bcd4fd53cbb..f321b47aec0 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -31,5 +31,10 @@ enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS, OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE, OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES, - OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_LOCAL_INFILE, OPT_PROMPT, - OPT_IGN_LINES }; + OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_AUTO_REHASH, + OPT_LINE_NUMBERS, OPT_COLUMN_NAMES, OPT_CONNECT_TIMEOUT, + OPT_MAX_ALLOWED_PACKET, OPT_NET_BUFFER_LENGTH, + OPT_SELECT_LIMIT, OPT_MAX_JOIN_SIZE, OPT_SSL_SSL, + OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH, + OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE, + OPT_PROMPT, OPT_IGN_LINES }; |