From 2f840aa97b790795e94c48d79c3394848c68fd09 Mon Sep 17 00:00:00 2001
From: unknown <jamppa@suse9-x86.mysql.com>
Date: Fri, 18 Nov 2005 18:25:46 +0100
Subject: [PATCH] Netware specific changes for 5.0.16a
client/mysql.cc:
Fixed option.
client/mysqladmin.cc:
Fixed option.
client/mysqlbinlog.cc:
Fixed option.
client/mysqlcheck.c:
Fixed option.
client/mysqldump.c:
Fixed option.
client/mysqlimport.c:
Fixed option.
client/mysqlshow.c:
Fixed option.
configure.in:
Changed version for Netware.
myisam/myisamchk.c:
Fixed option.
myisam/myisampack.c:
Fixed option.
netware/mysql_test_run.c:
NetWare specific changes:
Define MYSQL_CHECK environment variable to make mysqlcheck test case pass
---
client/mysql.cc | 2 +-
client/mysqladmin.cc | 2 +-
client/mysqlbinlog.cc | 2 +-
client/mysqlcheck.c | 2 +-
client/mysqldump.c | 2 +-
client/mysqlimport.c | 2 +-
client/mysqlshow.c | 2 +-
configure.in | 2 +-
myisam/myisamchk.c | 2 +-
myisam/myisampack.c | 2 +-
netware/mysql_test_run.c | 3 +++
11 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/client/mysql.cc b/client/mysql.cc
index 441687e2e4e..bcd0c2453f7 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -527,7 +527,7 @@ static struct my_option my_long_options[] =
{"help", 'I', "Synonym for -?", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
0, 0, 0, 0, 0},
#ifdef __NETWARE__
- {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"auto-rehash", OPT_AUTO_REHASH,
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
index ec136402bd8..53bf59af67a 100644
--- a/client/mysqladmin.cc
+++ b/client/mysqladmin.cc
@@ -127,7 +127,7 @@ static TYPELIB command_typelib=
static struct my_option my_long_options[] =
{
#ifdef __NETWARE__
- {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"count", 'c',
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 6cba3c0cb44..7eb26d30cf9 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -647,7 +647,7 @@ static struct my_option my_long_options[] =
{
#ifdef __NETWARE__
- {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
/*
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 2eb3e55c2e9..1324060eb55 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -63,7 +63,7 @@ static struct my_option my_long_options[] =
(gptr*) &opt_all_in_1, (gptr*) &opt_all_in_1, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
#ifdef __NETWARE__
- {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"auto-repair", OPT_AUTO_REPAIR,
diff --git a/client/mysqldump.c b/client/mysqldump.c
index b92b971ea4f..d3676362da4 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -173,7 +173,7 @@ static struct my_option my_long_options[] =
"Allow creation of column names that are keywords.", (gptr*) &opt_keywords,
(gptr*) &opt_keywords, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef __NETWARE__
- {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"character-sets-dir", OPT_CHARSETS_DIR,
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index 19d4ef16ef9..958f987d16b 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -59,7 +59,7 @@ static char *shared_memory_base_name=0;
static struct my_option my_long_options[] =
{
#ifdef __NETWARE__
- {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"character-sets-dir", OPT_CHARSETS_DIR,
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 8f6be6cf70b..8369d918d6f 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
static struct my_option my_long_options[] =
{
#ifdef __NETWARE__
- {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"character-sets-dir", 'c', "Directory where character sets are.",
diff --git a/configure.in b/configure.in
index c36d24a5bc5..c6c3f1236e6 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.16)
+AM_INIT_AUTOMAKE(mysql, 5.0.16a)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index b3d95d21eb7..e2c8b446322 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -165,7 +165,7 @@ static struct my_option my_long_options[] =
"Analyze distribution of keys. Will make some joins in MySQL faster. You can check the calculated distribution.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef __NETWARE__
- {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"block-search", 'b',
diff --git a/myisam/myisampack.c b/myisam/myisampack.c
index 114e80d8f1a..d691c24e890 100644
--- a/myisam/myisampack.c
+++ b/myisam/myisampack.c
@@ -254,7 +254,7 @@ enum options_mp {OPT_CHARSETS_DIR_MP=256, OPT_AUTO_CLOSE};
static struct my_option my_long_options[] =
{
#ifdef __NETWARE__
- {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"backup", 'b', "Make a backup of the table as table_name.OLD.",
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c
index 92ed89b4770..98b7ab7fd8c 100644
--- a/netware/mysql_test_run.c
+++ b/netware/mysql_test_run.c
@@ -1173,6 +1173,9 @@ void setup(char *file)
setenv("MYSQL",file_path,1);
snprintf(file_path, PATH_MAX*2, "%s/mysqlshow --no-defaults --user=root --port=%u", bin_dir, master_port);
setenv("MYSQL_SHOW",file_path,1);
+ snprintf(file_path, PATH_MAX*2, "%s/mysqlcheck --no-defaults -uroot --port=%u", bin_dir, master_port);
+ setenv("MYSQL_CHECK",file_path,1);
+
}
/******************************************************************************
--
GitLab