Correction of merge mishandling in 'client/client_priv.h'.

client/client_priv.h: Correction of merge mishandling.

Correction of merge mishandling in 'client/client_priv.h'.
client/client_priv.h: Correction of merge mishandling.
763f04ad · unknown · 1c8b1af1 · 763f04ad
Commit 763f04ad authored May 26, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

client/client_priv.h client/client_priv.h +1 -1

No files found.
--- a/client/client_priv.h
+++ b/client/client_priv.h
@@ -49,5 +49,5 @@ enum options_client
 #ifdef HAVE_NDBCLUSTER_DB
  OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,
 #endif
-  ,OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_DROP_DATABASE,OPT_DROP_DATABASE
+  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE
 };