Skip to content

M
MariaDB
Commit a1a308d3 authored by jani@hynda.mysql.fi's avatar jani@hynda.mysql.fi
Browse files
Options

Fixed a bug in mysql.cc

parent 25612333
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
client/mysql.cc
View file @ a1a308d3
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <signal.h> #include <signal.h>
#include <violite.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 */ /* Don't try to make a nice table if the data is too big */
#define MAX_COLUMN_LENGTH 1024 #define MAX_COLUMN_LENGTH 1024
...@@ -129,6 +129,7 @@ static String glob_buffer,old_buffer; ...@@ -129,6 +129,7 @@ static String glob_buffer,old_buffer;
static int wait_time = 5; static int wait_time = 5;
static STATUS status; static STATUS status;
static ulong select_limit,max_join_size,opt_connect_timeout=0; static ulong select_limit,max_join_size,opt_connect_timeout=0;
char mysql_charsets_dir[FN_REFLEN+1];
static const char *xmlmeta[] = { static const char *xmlmeta[] = {
"&", "&amp;", "&", "&amp;",
"<", "&lt;", "<", "&lt;",
...@@ -609,7 +610,8 @@ static int get_options(int argc, char **argv) ...@@ -609,7 +610,8 @@ static int get_options(int argc, char **argv)
default_charset= optarg; default_charset= optarg;
break; break;
case OPT_CHARSETS_DIR: case OPT_CHARSETS_DIR:
charsets_dir= optarg; strmov(mysql_charsets_dir, optarg);
charsets_dir = mysql_charsets_dir;
break; break;
case OPT_TEE: case OPT_TEE:
if (!opt_outfile && strlen(optarg)) if (!opt_outfile && strlen(optarg))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7