diff options
| author | bar@mysql.com <> | 2005-09-06 14:35:36 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2005-09-06 14:35:36 +0500 |
| commit | 51d0e0bc30ac59fa2320b1fa6360d1023ddb9d47 (patch) | |
| tree | 500e75558ea4864f5742c953cd9d9c6a1a512fae /sql/mysqld.cc | |
| parent | 891885e9c2c60559c3bd69cbe6298e78d816b7a3 (diff) | |
| parent | 6a5f00702d32b321ce80c78938b67a267e1991af (diff) | |
| download | mariadb-git-51d0e0bc30ac59fa2320b1fa6360d1023ddb9d47.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b9948
into mysql.com:/usr/home/bar/mysql-5.0
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a3cc3d2916b..919f7c3d2e2 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -338,6 +338,8 @@ static my_bool opt_sync_bdb_logs; bool opt_log, opt_update_log, opt_bin_log, opt_slow_log; bool opt_error_log= IF_WIN(1,0); bool opt_disable_networking=0, opt_skip_show_db=0; +bool opt_character_set_client_handshake= 1; +bool lower_case_table_names_used= 0; bool server_id_supplied = 0; bool opt_endinfo,using_udf_functions, locked_in_memory; bool opt_using_transactions, using_update_log; @@ -4410,6 +4412,7 @@ enum options_mysqld OPT_EXPIRE_LOGS_DAYS, OPT_GROUP_CONCAT_MAX_LEN, OPT_DEFAULT_COLLATION, + OPT_CHARACTER_SET_CLIENT_HANDSHAKE, OPT_INIT_CONNECT, OPT_INIT_SLAVE, OPT_SECURE_AUTH, @@ -4511,6 +4514,11 @@ Disable with --skip-bdb (will save memory).", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"bootstrap", OPT_BOOTSTRAP, "Used by mysql installation scripts.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, + {"character-set-client-handshake", OPT_CHARACTER_SET_CLIENT_HANDSHAKE, + "Don't use client side character set value sent during handshake.", + (gptr*) &opt_character_set_client_handshake, + (gptr*) &opt_character_set_client_handshake, + 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"character-set-server", 'C', "Set the default character set.", (gptr*) &default_character_set_name, (gptr*) &default_character_set_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, |