diff options
| author | unknown <hartmut@mysql.com> | 2005-12-05 11:32:51 +0100 |
|---|---|---|
| committer | unknown <hartmut@mysql.com> | 2005-12-05 11:32:51 +0100 |
| commit | 51e8d273507a6c1e5dc427b440738f5cfa33f647 (patch) | |
| tree | e6b0ba96dfb091100778a0ff1dffc56c450718b6 /client/client_priv.h | |
| parent | bf0a3bfc6c52ffe1a1a404e79f1915691add9e32 (diff) | |
| parent | 5b0d4f3615d85a93a9c0273d48be60c358b20d3a (diff) | |
| download | mariadb-git-51e8d273507a6c1e5dc427b440738f5cfa33f647.tar.gz | |
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
client/client_priv.h:
Auto merged
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 62ccefe3215..a9c5f517d19 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -52,5 +52,5 @@ enum options_client OPT_TRIGGERS, OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE, OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA, - OPT_MYSQL_REPLACE_INTO + OPT_MYSQL_REPLACE_INTO, OPT_SERVER_ID }; |