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

4572248a · joerg@mysql.com · f39f0490 · 4572248a
Commit 4572248a authored May 26, 2005 by joerg@mysql.com
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
 };