Commit 763f04ad authored by unknown's avatar unknown
Browse files

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


client/client_priv.h:
  Correction of merge mishandling.
parent 1c8b1af1

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -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

};