diff options
| author | unknown <joerg@mysql.com> | 2005-05-26 12:58:55 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-05-26 12:58:55 +0200 |
| commit | 763f04ad1aad4db4e475e7acf9718f96d8da69ad (patch) | |
| tree | b26099486d9ef70de11e7ebe915a92887d0eb9b3 | |
| parent | 1c8b1af142cc8c5ca3e59262944b93000cf74304 (diff) | |
| download | mariadb-git-763f04ad1aad4db4e475e7acf9718f96d8da69ad.tar.gz | |
Correction of merge mishandling in 'client/client_priv.h'.
client/client_priv.h:
Correction of merge mishandling.
| -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 }; |