summaryrefslogtreecommitdiff
path: root/client/client_priv.h
diff options
context:
space:
mode:
authorAlexander Nozdrin <alexander.nozdrin@oracle.com>2011-04-08 14:49:52 +0400
committerAlexander Nozdrin <alexander.nozdrin@oracle.com>2011-04-08 14:49:52 +0400
commitbbff1f60f21d994ab622a791bfef374c05712473 (patch)
tree3384a25158ea952773de0b6dbf5e701df72dd890 /client/client_priv.h
parent7db84dc7caa0055d8b718a7da18f84aea2a20134 (diff)
parent9303909a7a80395dfb512a82208eb14a7f654c60 (diff)
downloadmariadb-git-bbff1f60f21d994ab622a791bfef374c05712473.tar.gz
Auto-merge from mysql-5.5.
Diffstat (limited to 'client/client_priv.h')
-rw-r--r--client/client_priv.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/client/client_priv.h b/client/client_priv.h
index 0652444be64..ae8d049f8e6 100644
--- a/client/client_priv.h
+++ b/client/client_priv.h
@@ -75,6 +75,7 @@ enum options_client
OPT_SLAP_POST_SYSTEM,
OPT_SLAP_COMMIT,
OPT_SLAP_DETACH,
+ OPT_SLAP_NO_DROP,
OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT_MODE, OPT_SERVER_ID,
OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
OPT_AUTO_VERTICAL_OUTPUT,