diff options
| author | unknown <jimw@mysql.com> | 2005-01-06 17:27:48 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-06 17:27:48 +0100 |
| commit | f168695f4b94f5a0162085ecb42e7c58f1178390 (patch) | |
| tree | d6b903ab357703e3376609ff3ab445732cc882aa /client/mysqladmin.cc | |
| parent | 2cdef33424f8e7370e5e24304a62d4911a2167c5 (diff) | |
| parent | 3a756a66760a50f5911cddc86c0e658209f07e39 (diff) | |
| download | mariadb-git-f168695f4b94f5a0162085ecb42e7c58f1178390.tar.gz | |
Merge mysql.com:/home/jwinstead2/mysql-4.1-7451
into mysql.com:/home/jwinstead2/mysql-4.1-clean
client/mysqladmin.cc:
Auto merged
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 6916b4ea808..24cd461b1fa 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -33,7 +33,8 @@ #define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */ #define MAX_TRUNC_LENGTH 3 -char *host= NULL, *user= 0, *opt_password= 0; +char *host= NULL, *user= 0, *opt_password= 0, + *default_charset= NULL; char truncated_var_names[MAX_MYSQL_VAR][MAX_TRUNC_LENGTH]; char ex_var_names[MAX_MYSQL_VAR][FN_REFLEN]; ulonglong last_values[MAX_MYSQL_VAR]; @@ -145,6 +146,9 @@ static struct my_option my_long_options[] = {"character-sets-dir", OPT_CHARSETS_DIR, "Directory where character sets are.", (gptr*) &charsets_dir, (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"default-character-set", OPT_DEFAULT_CHARSET, + "Set the default character set.", (gptr*) &default_charset, + (gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"host", 'h', "Connect to host.", (gptr*) &host, (gptr*) &host, 0, GET_STR, @@ -343,6 +347,8 @@ int main(int argc,char *argv[]) if (shared_memory_base_name) mysql_options(&mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name); #endif + if (default_charset) + mysql_options(&mysql, MYSQL_SET_CHARSET_NAME, default_charset); if (sql_connect(&mysql, option_wait)) { unsigned int err= mysql_errno(&mysql); |