diff options
| author | unknown <brian@zim.(none)> | 2005-05-08 16:19:06 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-05-08 16:19:06 -0700 |
| commit | 291a628ec5a66e2339c9bceae585ab769dfe8f00 (patch) | |
| tree | ed525a6041ce93087659d2dba13b76945979f967 /client/client_priv.h | |
| parent | 848611b5ed1e565d02eea896e22753b818c458c5 (diff) | |
| parent | d808b76db5b5fedda598e7e9368439472e5aef15 (diff) | |
| download | mariadb-git-291a628ec5a66e2339c9bceae585ab769dfe8f00.tar.gz | |
Merge
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
client/client_priv.h:
c
e
?
h
mysql-test/t/mysqldump.test:
Resolved conflict.
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 8d25bddc286..24df2bdee7f 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_IGNORE_TABLE,OPT_INSERT_IGNORE }; |