diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-04-03 12:33:13 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-04-03 12:33:13 +0300 |
| commit | f5feb33773cfbce726342e00bea5c436a5553554 (patch) | |
| tree | 6f998a1c6569b65acd1c6e4b47301819545b012c /client/client_priv.h | |
| parent | e9635c95afae837e2e7cfe85f0fe7ab7eda23aac (diff) | |
| parent | 68fc04c4236b57a3a83d5731fb991329d6be95ef (diff) | |
| download | mariadb-git-f5feb33773cfbce726342e00bea5c436a5553554.tar.gz | |
Merge with 3.23 to get fixes for:
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.
BitKeeper/etc/logging_ok:
auto-union
sql/log.cc:
Auto merged
client/client_priv.h:
Merge with 3.23
client/mysqldump.c:
Merge with 3.23
myisam/mi_dynrec.c:
Merge with 3.23
mysql-test/t/myisam.test:
Merge with 3.23
sql/log_event.cc:
Merge with 3.23
sql/slave.cc:
Merge with 3.23
sql/sql_delete.cc:
Merge with 3.23
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index b8181245be2..85c99951532 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -37,4 +37,5 @@ enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, 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_DELETE_MASTER_LOGS, OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION, OPT_FRM }; |