diff options
| author | unknown <jani@hynda.mysql.fi> | 2001-11-06 02:29:59 +0200 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2001-11-06 02:29:59 +0200 |
| commit | eab5a91ecd653357f72cd1ab60958bdc3c4ac16f (patch) | |
| tree | a29a13724d847e32b89298bb2c848ba0faa26365 /client | |
| parent | 80fabff0d410afc52fe034b6fe064eba69afea66 (diff) | |
| download | mariadb-git-eab5a91ecd653357f72cd1ab60958bdc3c4ac16f.tar.gz | |
Fixed a bug in mysql.cc
client/mysql.cc:
Fixed a bug with too early freeing for 'charsets_dir'.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 653f6bc9f44..19e95b2f1c8 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -38,7 +38,7 @@ #include <signal.h> #include <violite.h> -const char *VER="11.16"; +const char *VER="11.17"; /* Don't try to make a nice table if the data is too big */ #define MAX_COLUMN_LENGTH 1024 @@ -129,6 +129,7 @@ static String glob_buffer,old_buffer; static int wait_time = 5; static STATUS status; static ulong select_limit,max_join_size,opt_connect_timeout=0; +char mysql_charsets_dir[FN_REFLEN+1]; static const char *xmlmeta[] = { "&", "&", "<", "<", @@ -609,7 +610,8 @@ static int get_options(int argc, char **argv) default_charset= optarg; break; case OPT_CHARSETS_DIR: - charsets_dir= optarg; + strmov(mysql_charsets_dir, optarg); + charsets_dir = mysql_charsets_dir; break; case OPT_TEE: if (!opt_outfile && strlen(optarg)) |