diff options
Diffstat (limited to 'netware')
| -rwxr-xr-x | netware/BUILD/compile-AUTOTOOLS | 2 | ||||
| -rwxr-xr-x | netware/BUILD/compile-linux-tools | 6 | ||||
| -rwxr-xr-x | netware/BUILD/nwbootstrap | 10 | ||||
| -rw-r--r-- | netware/Makefile.am | 14 | ||||
| -rw-r--r-- | netware/my_manage.h | 3 | ||||
| -rw-r--r-- | netware/mysql_install_db.c | 1 | ||||
| -rw-r--r-- | netware/mysql_test_run.c | 20 | ||||
| -rw-r--r-- | netware/mysqlslap.def | 11 |
8 files changed, 47 insertions, 20 deletions
diff --git a/netware/BUILD/compile-AUTOTOOLS b/netware/BUILD/compile-AUTOTOOLS index 57213b1b3d0..20e506aa683 100755 --- a/netware/BUILD/compile-AUTOTOOLS +++ b/netware/BUILD/compile-AUTOTOOLS @@ -6,7 +6,7 @@ # stop on errors set -e -for package in . ./innobase +for package in . ./storage/innobase do (cd $package rm -rf config.cache autom4te.cache diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools index 14422ea5a3f..02c11998365 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/nwbootstrap b/netware/BUILD/nwbootstrap index 48ff2a49667..22e1569e7ca 100755 --- a/netware/BUILD/nwbootstrap +++ b/netware/BUILD/nwbootstrap @@ -160,6 +160,11 @@ sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \ -e "s;VERSION;$version;g" $mwenv.org > $mwenv chmod +rwx $mwenv +PWD=`pwd` +SRC_DIR=`grep "^export MYDEV=" $mwenv | cut -d'=' -f2 | \ + sed -e 's;";;g' -e "s;^;echo ;g" -e "s;$;/\`basename $PWD\`;g" | /bin/sh` + + # edit the def file versions echo "updating *.def file versions..." nlm_version=`echo "$version" | sed -e "s;\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*;\1, \2, \3;"` @@ -167,13 +172,14 @@ nlm_version=`echo "$version" | sed -e "s;\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*;\1 for file in ./netware/*.def do mv -f $file $file.org - sed -e "s;VERSION.*;VERSION $nlm_version;g" $file.org > $file + sed -e "s;VERSION.*;VERSION $nlm_version;g" \ + -e "s;XDCDATA.*;XDCDATA $SRC_DIR/netware/mysql.xdc;g" $file.org > $file rm $file.org done # create the libmysql.imp file in netware folder from libmysql/libmysql.def # file -echo "generating llibmysql.imp file..." +echo "generating libmysql.imp file..." awk 'BEGIN{x=0;} END{printf("\n");} x==1 {printf(" %s",$1); x++; next} x>1 {printf(",\n %s", $1);next} /EXPORTS/{x=1}' libmysql/libmysql.def > netware/libmysql.imp # build linux tools echo "compiling linux tools..." diff --git a/netware/Makefile.am b/netware/Makefile.am index 648ce79c484..beb3fda35ee 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -30,13 +30,17 @@ 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/mysqlslap.def \ + sql/mysqld.def extra/mysql_waitpid.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 link_sources: set -x; \ @@ -69,7 +73,7 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def init_db.sql 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 perror.def \ + mysqlshow.def mysqltest.def mysqlslap.def perror.def \ replace.def resolve_stack_dump.def resolveip.def test_db.sql \ static_init_db.sql \ BUILD/apply-patch BUILD/compile-AUTOTOOLS \ 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/mysql_install_db.c b/netware/mysql_install_db.c index 65ee7873e5c..07e02c35ff3 100644 --- a/netware/mysql_install_db.c +++ b/netware/mysql_install_db.c @@ -361,7 +361,6 @@ 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"); // spawn mysqld err = spawn(mysqld, &al, TRUE, sql_file, out_log, err_log); diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c index 6bab2f0149c..774aa61bea4 100644 --- a/netware/mysql_test_run.c +++ b/netware/mysql_test_run.c @@ -210,7 +210,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) @@ -1189,7 +1188,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]); @@ -1236,16 +1235,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); @@ -1297,7 +1302,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 + |