summaryrefslogtreecommitdiff
path: root/netware
diff options
context:
space:
mode:
Diffstat (limited to 'netware')
-rwxr-xr-xnetware/BUILD/compile-AUTOTOOLS6
-rwxr-xr-xnetware/BUILD/compile-linux-tools6
-rwxr-xr-xnetware/BUILD/compile-netware-START1
-rwxr-xr-xnetware/BUILD/compile-netware-max2
-rwxr-xr-xnetware/BUILD/compile-netware-max-debug2
-rwxr-xr-xnetware/BUILD/mwenv6
-rw-r--r--netware/Makefile.am18
-rw-r--r--netware/my_manage.h3
-rw-r--r--netware/myisam_ftdump.def2
-rw-r--r--netware/myisamchk.def2
-rw-r--r--netware/myisamlog.def2
-rw-r--r--netware/myisampack.def2
-rw-r--r--netware/mysql_install_db.c10
-rw-r--r--netware/mysql_test_run.c20
-rw-r--r--netware/mysqlslap.def11
15 files changed, 63 insertions, 30 deletions
diff --git a/netware/BUILD/compile-AUTOTOOLS b/netware/BUILD/compile-AUTOTOOLS
index 57213b1b3d0..c93fb1b1b28 100755
--- a/netware/BUILD/compile-AUTOTOOLS
+++ b/netware/BUILD/compile-AUTOTOOLS
@@ -5,8 +5,11 @@
# stop on errors
set -e
+sed -e "s/^DIST_COMMON/#DIST_COMMON/g" storage/ndb/Makefile.am > storage/ndb/Makefile.am.$$
+mv storage/ndb/Makefile.am.$$ storage/ndb/Makefile.am
-for package in . ./innobase
+# for package in . ./storage/innobase
+for package in .
do
(cd $package
rm -rf config.cache autom4te.cache
@@ -14,6 +17,7 @@ do
autoheader
libtoolize --force
aclocal
+# automake --verbose --add-missing --force-missing
automake --add-missing --force-missing
autoconf)
done
diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools
index 8cca00d142f..6a6abd32639 100755
--- a/netware/BUILD/compile-linux-tools
+++ b/netware/BUILD/compile-linux-tools
@@ -37,11 +37,11 @@ make
(cd dbug; make libdbug.a)
(cd strings; make libmystrings.a)
(cd mysys; make libmysys.a)
-(cd heap; make libheap.a)
+(cd storage/heap; make libheap.a)
(cd vio; make libvio.a)
(cd regex; make libregex.a)
-(cd myisam; make libmyisam.a)
-(cd myisammrg; make libmyisammrg.a)
+(cd storage/myisam; make libmyisam.a)
+(cd storage/myisammrg; make libmyisammrg.a)
(cd extra; make comp_err)
(cd libmysql; make conf_to_src)
(cd libmysql_r; make conf_to_src)
diff --git a/netware/BUILD/compile-netware-START b/netware/BUILD/compile-netware-START
index 95b222994d3..8f828f34bd1 100755
--- a/netware/BUILD/compile-netware-START
+++ b/netware/BUILD/compile-netware-START
@@ -24,5 +24,4 @@ base_configs=" \
--prefix=N:/mysql \
--without-mysqlmanager \
--without-man \
- --without-csv-storage-engine \
"
diff --git a/netware/BUILD/compile-netware-max b/netware/BUILD/compile-netware-max
index 3286c3c693b..d8278a4e915 100755
--- a/netware/BUILD/compile-netware-max
+++ b/netware/BUILD/compile-netware-max
@@ -15,7 +15,7 @@ suffix="max"
extra_configs=" \
--with-innodb \
--with-embedded-server \
- --with-yassl \
+ --with-ssl \
"
. $path/compile-netware-END
diff --git a/netware/BUILD/compile-netware-max-debug b/netware/BUILD/compile-netware-max-debug
index e3155cbd7d7..de1b5dd17cc 100755
--- a/netware/BUILD/compile-netware-max-debug
+++ b/netware/BUILD/compile-netware-max-debug
@@ -15,7 +15,7 @@ extra_configs=" \
--with-innodb \
--with-debug=full \
--with-embedded-server \
- --with-yassl \
+ --with-ssl \
"
. $path/compile-netware-END
diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index a8d31949736..44497c48917 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -8,7 +8,7 @@ fi
# The base path(in wineformat) where compilers, includes and
# libraries are installed
-if test -z $MYDEV
+if test -z "$MYDEV"
then
# the default is "F:/mydev"
export MYDEV="F:/mydev"
@@ -26,8 +26,8 @@ WINE_BUILD_DIR=`echo "$BUILD_DIR" | sed 's_'$base_unix_part'/__'`
WINE_BUILD_DIR="$base/$WINE_BUILD_DIR"
echo "WINE_BUILD_DIR: $WINE_BUILD_DIR"
-# Look for libc, MySQL 5.0.x uses libc-2003 by default
-libc_dir="$MYDEV/libc-2003"
+# Look for libc, MySQL 5.1.x uses libc-2006 by default
+libc_dir="$MYDEV/libc-2006"
if [ ! -d `winepath $libc_dir` ]
then
# The libcdir didn't exist, set default
diff --git a/netware/Makefile.am b/netware/Makefile.am
index 0f11ee85eb0..3d0402ce714 100644
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
@@ -30,15 +30,18 @@ netware_build_files = client/mysql.def client/mysqladmin.def \
client/mysqlbinlog.def client/mysqlcheck.def \
client/mysqldump.def client/mysqlimport.def \
client/mysqlshow.def client/mysqltest.def \
- client/mysql_upgrade.def \
+ client/mysqlslap.def client/mysql_upgrade.def \
+ sql/mysqld.def extra/mysql_waitpid.def \
tests/mysql_client_test.def \
extra/my_print_defaults.def \
extra/perror.def extra/replace.def \
extra/resolveip.def extra/comp_err.def \
- libmysqld/libmysqld.def myisam/myisamchk.def \
- myisam/myisamlog.def myisam/myisampack.def \
- sql/mysqld.def extra/mysql_waitpid.def \
- extra/resolve_stack_dump.def myisam/myisam_ftdump.def
+ extra/resolve_stack_dump.def \
+ libmysqld/libmysqld.def \
+ storage/myisam/myisamchk.def \
+ storage/myisam/myisamlog.def \
+ storage/myisam/myisampack.def \
+ storage/myisam/myisam_ftdump.def
BUILT_SOURCES = link_sources init_db.sql test_db.sql
CLEANFILES = $(BUILT_SOURCES)
@@ -46,12 +49,12 @@ CLEANFILES = $(BUILT_SOURCES)
all: $(BUILT_SOURCES)
link_sources:
- set -x; \
for f in $(netware_build_files); do \
rm -f ../$$f; \
org=`basename $$f`; \
@LN_CP_F@ $(srcdir)/$$org ../$$f; \
done
+ echo timestamp > link_sources
else
@@ -78,7 +81,8 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \
mysql_test_run.def mysql_waitpid.def mysqladmin.def \
mysqlbinlog.def mysqlcheck.def mysqld.def \
mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \
- mysqlshow.def mysqltest.def mysql_upgrade.def perror.def \
+ mysqlshow.def mysqltest.def mysqlslap.def mysql_upgrade.def \
+ perror.def \
mysql_client_test.def \
replace.def resolve_stack_dump.def resolveip.def \
static_init_db.sql init_db.sql test_db.sql \
diff --git a/netware/my_manage.h b/netware/my_manage.h
index 480eefbe55a..360f2f104be 100644
--- a/netware/my_manage.h
+++ b/netware/my_manage.h
@@ -54,7 +54,8 @@ bool skip_first_param;
#define ARG_BUF 10
-#define TRY_MAX 5
+#define TRY_MAX 5
+#define NULL (char) 0
#ifdef __NETWARE__
#define strstr(A,B) strindex(A,B)
diff --git a/netware/myisam_ftdump.def b/netware/myisam_ftdump.def
index 78123537a54..f2b4890a54d 100644
--- a/netware/myisam_ftdump.def
+++ b/netware/myisam_ftdump.def
@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
DESCRIPTION "MySQL MyISAM Table Dump Tool"
VERSION 4, 0
STACKSIZE 131072
-XDCDATA ../netware/mysql.xdc
+XDCDATA ../../netware/mysql.xdc
#DEBUG
diff --git a/netware/myisamchk.def b/netware/myisamchk.def
index 9805eb4ec1b..71fb66d0ed1 100644
--- a/netware/myisamchk.def
+++ b/netware/myisamchk.def
@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
DESCRIPTION "MySQL MyISAM Table Check Tool"
VERSION 4, 0
STACKSIZE 131072
-XDCDATA ../netware/mysql.xdc
+XDCDATA ../../netware/mysql.xdc
#DEBUG
diff --git a/netware/myisamlog.def b/netware/myisamlog.def
index 925650eac7b..1924ba2192b 100644
--- a/netware/myisamlog.def
+++ b/netware/myisamlog.def
@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
DESCRIPTION "MySQL MyISAM Table Log Tool"
VERSION 4, 0
STACKSIZE 131072
-XDCDATA ../netware/mysql.xdc
+XDCDATA ../../netware/mysql.xdc
#DEBUG
diff --git a/netware/myisampack.def b/netware/myisampack.def
index 877a143fd2e..39fd1b34100 100644
--- a/netware/myisampack.def
+++ b/netware/myisampack.def
@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
DESCRIPTION "MySQL MyISAM Table Pack Tool"
VERSION 4, 0
STACKSIZE 131072
-XDCDATA ../netware/mysql.xdc
+XDCDATA ../../netware/mysql.xdc
#DEBUG
diff --git a/netware/mysql_install_db.c b/netware/mysql_install_db.c
index 218c5024a8c..98852c89825 100644
--- a/netware/mysql_install_db.c
+++ b/netware/mysql_install_db.c
@@ -362,7 +362,15 @@ int mysql_install_db(int argc, char *argv[])
add_arg(&al, "--bootstrap");
add_arg(&al, "--skip-grant-tables");
add_arg(&al, "--skip-innodb");
- add_arg(&al, "--skip-bdb");
+
+ if ((err = stat(sql_file, &info)) != 0)
+ {
+ printf("ERROR - %s:\n", strerror(errno));
+ printf("\t%s\n\n", sql_file);
+ // free args
+ free_args(&al);
+ exit(-1);
+ }
if ((err = stat(sql_file, &info)) != 0)
{
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c
index c5974b44c1d..010c4380fdd 100644
--- a/netware/mysql_test_run.c
+++ b/netware/mysql_test_run.c
@@ -211,7 +211,6 @@ void install_db(char *datadir)
add_arg(&al, "--basedir=%s", base_dir);
add_arg(&al, "--datadir=%s", datadir);
add_arg(&al, "--skip-innodb");
- add_arg(&al, "--skip-bdb");
// spawn
if ((err = spawn(mysqld_file, &al, TRUE, input, output, error)) != 0)
@@ -1191,7 +1190,7 @@ void setup(char *file)
******************************************************************************/
int main(int argc, char **argv)
{
- int is_ignore_list = 0;
+ int is_ignore_list= 0, autoclose= 0, individual_execution= 0;
// setup
setup(argv[0]);
@@ -1238,16 +1237,22 @@ int main(int argc, char **argv)
{
int i;
- // single test
- single_test = TRUE;
-
for (i = 1 + is_ignore_list; i < argc; i++)
{
+ if (!strncasecmp(argv[i], "--autoclose", 11))
+ {
+ autoclose= 1;
+ continue;
+ }
+ // single test
+ single_test= TRUE;
+ individual_execution= 1;
+
// run given test
run_test(argv[i]);
}
}
- else
+ if (!individual_execution)
{
// run all tests
DIR *dir = opendir(test_dir);
@@ -1299,7 +1304,8 @@ int main(int argc, char **argv)
if (log_fd) fclose(log_fd);
// keep results up
- pressanykey();
+ if (!autoclose)
+ pressanykey();
return 0;
}
diff --git a/netware/mysqlslap.def b/netware/mysqlslap.def
new file mode 100644
index 00000000000..be10f9db192
--- /dev/null
+++ b/netware/mysqlslap.def
@@ -0,0 +1,11 @@
+#------------------------------------------------------------------------------
+# MySQL Slap
+#------------------------------------------------------------------------------
+MODULE libc.nlm
+SCREENNAME "MySQL Slap[scrollable]"
+COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
+DESCRIPTION "MySQL Slap Tool"
+VERSION 4, 0
+XDCDATA ../netware/mysql.xdc
+#DEBUG
+
View Lorry Controller Status