diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-03-23 20:39:37 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-03-23 20:39:37 +0100 |
| commit | 9a58f9ab0bb8edb8b0d3e856927b3b507e35e9d3 (patch) | |
| tree | ddaf246139b7eebb36f1d8da04c571f2df16abdb /client/client_priv.h | |
| parent | fc9c22dbe4c198058c71c68ca682462d2a5d9923 (diff) | |
| parent | 35f8f3fc581c9afdcc06ce039d925cd8171639c7 (diff) | |
| download | mariadb-git-9a58f9ab0bb8edb8b0d3e856927b3b507e35e9d3.tar.gz | |
Merge sin.intern.azundris.com:/home/tnurnberg/26817/50-26817
into sin.intern.azundris.com:/home/tnurnberg/26817/51-26817
client/mysqldump.c:
Auto merged
mysql-test/r/information_schema_db.result:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
client/client_priv.h:
manual merge
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 646619f62b1..d5d8cb176ed 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -60,5 +60,5 @@ enum options_client OPT_SLAP_AUTO_GENERATE_SQL_LOAD_TYPE, OPT_SLAP_AUTO_GENERATE_WRITE_NUM, OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID, OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT, - OPT_DEBUG_INFO, OPT_COLUMN_TYPES + OPT_DEBUG_INFO, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE }; |