diff options
| author | monty@mashka.mysql.fi <> | 2003-10-16 03:08:40 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-10-16 03:08:40 +0300 |
| commit | e87c9f5ff8e94ababbed0161101cfd3616d20422 (patch) | |
| tree | bd2eb4ac5dffdd3ac1af40b53a3680a0a9d78195 /client/client_priv.h | |
| parent | 0d34e50f39e1b7cb14170dabc08f7823cb50a2e9 (diff) | |
| parent | 4d45ad98b966cf26b8aaf888deed7d1c4c61fc84 (diff) | |
| download | mariadb-git-e87c9f5ff8e94ababbed0161101cfd3616d20422.tar.gz | |
merge with 4.0
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 eede1a0a39d..d655619516d 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -26,7 +26,7 @@ /* We have to define 'enum options' identical in all files to keep OS2 happy */ -enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, +enum options_client { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE, OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS, OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE, |