summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorjani@hynda.mysql.fi <>2001-11-06 02:29:59 +0200
committerjani@hynda.mysql.fi <>2001-11-06 02:29:59 +0200
commita1a308d3113dd749fbcb7199984642ac22dec423 (patch)
treea29a13724d847e32b89298bb2c848ba0faa26365 /client
parent25612333a9b6bcd9145530750f33eac87dfa5b7e (diff)
downloadmariadb-git-a1a308d3113dd749fbcb7199984642ac22dec423.tar.gz
Fixed a bug in mysql.cc
Diffstat (limited to 'client')
-rw-r--r--client/mysql.cc6
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[] = {
"&", "&amp;",
"<", "&lt;",
@@ -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))