diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-28 16:23:04 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-28 16:23:04 +0500 |
| commit | eb4f5e2d6c693faecf152478cbe7e3883985548a (patch) | |
| tree | 014f51899b65b90c388c3d77676cada597fbb95e /client | |
| parent | af512c8d8c196b3132266dc76c8a458f42405f31 (diff) | |
| download | mariadb-git-eb4f5e2d6c693faecf152478cbe7e3883985548a.tar.gz | |
--with-collation argument for configure. Now one can for example use this:
./configure --with-charset=latin1 --with-collation=latin1_danish_ci
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | client/mysqlcheck.c | 3 | ||||
| -rw-r--r-- | client/mysqldump.c | 2 | ||||
| -rw-r--r-- | client/mysqlimport.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 33014b27ae8..aa9dcca92db 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -139,7 +139,7 @@ static my_string opt_mysql_unix_port=0; static int connect_flag=CLIENT_INTERACTIVE; static char *current_host,*current_db,*current_user=0,*opt_password=0, *current_prompt=0, *delimiter_str= 0, - *default_charset= (char*) MYSQL_CHARSET; + *default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME; static char *histfile; static String glob_buffer,old_buffer; static String processed_prompt; diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index 8f599c9f497..b21a73aae4f 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -38,7 +38,8 @@ static my_bool opt_alldbs = 0, opt_check_only_changed = 0, opt_extended = 0, static uint verbose = 0, opt_mysql_port=0; static my_string opt_mysql_unix_port = 0; static char *opt_password = 0, *current_user = 0, - *default_charset = (char *)MYSQL_CHARSET, *current_host = 0; + *default_charset = (char *)MYSQL_DEFAULT_CHARSET_NAME, + *current_host = 0; static int first_error = 0; DYNAMIC_ARRAY tables4repair; #ifdef HAVE_SMEM diff --git a/client/mysqldump.c b/client/mysqldump.c index 6a577af8792..86f03b46038 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -85,7 +85,7 @@ static MYSQL mysql_connection,*sock=0; static char insert_pat[12 * 1024],*opt_password=0,*current_user=0, *current_host=0,*path=0,*fields_terminated=0, *lines_terminated=0, *enclosed=0, *opt_enclosed=0, *escaped=0, - *where=0, *default_charset= (char *)MYSQL_CHARSET, + *where=0, *default_charset= (char *)MYSQL_DEFAULT_CHARSET_NAME, *opt_compatible_mode_str= 0, *err_ptr= 0; static ulong opt_compatible_mode= 0; diff --git a/client/mysqlimport.c b/client/mysqlimport.c index f247301c6dc..8ee656f23b2 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -44,7 +44,7 @@ static char *opt_password=0, *current_user=0, *current_host=0, *current_db=0, *fields_terminated=0, *lines_terminated=0, *enclosed=0, *opt_enclosed=0, *escaped=0, *opt_columns=0, - *default_charset= (char*) MYSQL_CHARSET; + *default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME; static uint opt_mysql_port=0; static my_string opt_mysql_unix_port=0; static my_string opt_ignore_lines=0; |