summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorserg@serg.mylan <>2003-09-29 11:21:17 +0200
committerserg@serg.mylan <>2003-09-29 11:21:17 +0200
commit8c7c4de0b4a7bcffe27e4549ed4dd242d71056df (patch)
tree0e0f863f590c511d1c5bc10fc7c918f0efa6a14f /client
parent9e68df23333ecb21ed776fcb983e2f98ca2d1721 (diff)
downloadmariadb-git-8c7c4de0b4a7bcffe27e4549ed4dd242d71056df.tar.gz
enum options renamed to avoid possible name conflicts
Diffstat (limited to 'client')
-rw-r--r--client/client_priv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h
index 85c99951532..5029f219494 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,