Commit a8c7affe authored by monty@donna.mysql.com's avatar monty@donna.mysql.com

Added "--character-sets-dir" to myisampack

parent 059ad7f0
...@@ -41177,6 +41177,8 @@ not yet 100 % confident in this code. ...@@ -41177,6 +41177,8 @@ not yet 100 % confident in this code.
@appendixsubsec Changes in release 3.23.33 @appendixsubsec Changes in release 3.23.33
@itemize bullet @itemize bullet
@item @item
Added @code{--character-sets-dir} to @code{myisampack}.
@item
Removed warnings when running @code{REPAIR TABLE .. EXTENDED}. Removed warnings when running @code{REPAIR TABLE .. EXTENDED}.
@item @item
Fixed core-dump bug when using @code{GROUP BY} on an alias, where Fixed core-dump bug when using @code{GROUP BY} on an alias, where
...@@ -229,10 +229,12 @@ int main(int argc, char **argv) ...@@ -229,10 +229,12 @@ int main(int argc, char **argv)
#endif #endif
} }
enum options {OPT_CHARSETS_DIR=256};
static struct option long_options[] = static struct option long_options[] =
{ {
{"backup", no_argument, 0, 'b'}, {"backup", no_argument, 0, 'b'},
{"character-sets-dir",required_argument,0, OPT_CHARSETS_DIR},
{"debug", optional_argument, 0, '#'}, {"debug", optional_argument, 0, '#'},
{"force", no_argument, 0, 'f'}, {"force", no_argument, 0, 'f'},
{"join", required_argument, 0, 'j'}, {"join", required_argument, 0, 'j'},
...@@ -249,7 +251,7 @@ static struct option long_options[] = ...@@ -249,7 +251,7 @@ static struct option long_options[] =
static void print_version(void) static void print_version(void)
{ {
printf("%s Ver 1.8 for %s on %s\n",my_progname,SYSTEM_TYPE,MACHINE_TYPE); printf("%s Ver 1.9 for %s on %s\n",my_progname,SYSTEM_TYPE,MACHINE_TYPE);
} }
static void usage(void) static void usage(void)
...@@ -332,6 +334,9 @@ static void get_options(int *argc,char ***argv) ...@@ -332,6 +334,9 @@ static void get_options(int *argc,char ***argv)
case '#': case '#':
DBUG_PUSH(optarg ? optarg : "d:t:o"); DBUG_PUSH(optarg ? optarg : "d:t:o");
break; break;
case OPT_CHARSETS_DIR:
charsets_dir = optarg;
break;
case 'V': print_version(); exit(0); case 'V': print_version(); exit(0);
case 'I': case 'I':
case '?': case '?':
......
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