diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
| commit | 5fa6df3081eea58dbd21e24315e27d166e66d23c (patch) | |
| tree | 9f6476af645cdeb53eefe6ca4f6bc6f4ac04bf84 /client/client_priv.h | |
| parent | 7bff1b0c345c6d8f334bd31f693fb9cbe69ea120 (diff) | |
| parent | 3a231663f034394fe341ebc98fa335f824fa3135 (diff) | |
| download | mariadb-git-5fa6df3081eea58dbd21e24315e27d166e66d23c.tar.gz | |
merge with 3.23.49
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/t/comments.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.cc:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 9a090b774bd..e8355e801a2 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -31,4 +31,4 @@ 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_MASTER_DATA, OPT_AUTOCOMMIT, OPT_LOCAL_INFILE}; |