From 4572248a84d965f041a62d72cdaf3e03cbe0b7ad Mon Sep 17 00:00:00 2001 From: "joerg@mysql.com" <> Date: Thu, 26 May 2005 12:58:55 +0200 Subject: [PATCH] Correction of merge mishandling in 'client/client_priv.h'. --- client/client_priv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/client_priv.h b/client/client_priv.h index a2f652af27..c8aa738527 100644 --- 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 }; -- 2.30.9