diff options
| author | unknown <gluh@eagle.(none)> | 2007-10-04 14:23:55 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-10-04 14:23:55 +0500 |
| commit | 4e15adf822090e226414904152d6e17a14288940 (patch) | |
| tree | f50dabc806c403577cfd9d2efa7e7dc5d5db38ef /client/client_priv.h | |
| parent | c3fb207658e2e8717d92c0ef26c9793906a57452 (diff) | |
| parent | a408f34866de14649b13dc1e4c08edf40a19db28 (diff) | |
| download | mariadb-git-4e15adf822090e226414904152d6e17a14288940.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
client/mysqldump.c:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/olap.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_view.cc:
Auto merged
client/client_priv.h:
manual merge
mysql-test/r/mysqldump.result:
manual merge
mysql-test/r/view_grant.result:
manual merge
sql/field.cc:
manual merge
sql/sql_select.cc:
manual merge
tests/mysql_client_test.c:
manual merge
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index a2f61b9e9ca..1414de2aa67 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -80,5 +80,7 @@ enum options_client 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_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE, - OPT_WRITE_BINLOG, OPT_MAX_CLIENT_OPTION + OPT_WRITE_BINLOG, OPT_MAX_CLIENT_OPTION, + OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT, + OPT_DEBUG_INFO, OPT_ERROR_LOG_FILE, OPT_DUMP_DATE }; |