diff options
| author | joerg@mysql.com <> | 2005-05-26 12:58:55 +0200 |
|---|---|---|
| committer | joerg@mysql.com <> | 2005-05-26 12:58:55 +0200 |
| commit | 4572248a84d965f041a62d72cdaf3e03cbe0b7ad (patch) | |
| tree | b26099486d9ef70de11e7ebe915a92887d0eb9b3 /client/client_priv.h | |
| parent | f39f049041db3a4db7bea247955b43687b48254d (diff) | |
| download | mariadb-git-4572248a84d965f041a62d72cdaf3e03cbe0b7ad.tar.gz | |
Correction of merge mishandling in 'client/client_priv.h'.
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index a2f652af273..c8aa7385276 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 }; |