From 2be8a470f9d5868345b31f8dd735ba588c6abb46 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 9 Jan 2003 15:22:38 +0200 Subject: A small fix for the type in the script --- scripts/mysqld_safe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 96d3437f96d..211cc8ceced 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -49,7 +49,7 @@ parse_arguments() { # QQ The --open-files should be removed --open-files=*) open_files=`echo "$arg" | sed -e "s;--open-files=;;"` ;; --open-files-limit=*) open_files=`echo "$arg" | sed -e "s;--open-files-limit=;;"` ;; - --core-file-size=*) core_file_size=`echo "$arg" | sed -e "s;--core_file_size=;;"` ;; + --core-file-size=*) core_file_size=`echo "$arg" | sed -e "s;--core-file-size=;;"` ;; --timezone=*) TZ=`echo "$arg" | sed -e "s;--timezone=;;"` ; export TZ; ;; --mysqld=*) MYSQLD=`echo "$arg" | sed -e "s;--mysqld=;;"` ;; --mysqld-version=*) -- cgit v1.2.1 From 787a2d4eda06e846f2984db57d3f0761aac5a8b2 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 23 Jan 2003 20:07:19 +0100 Subject: - merge relevant Do-compile changes from 4.0 tree - use "gnutar" on Mac OS X to build the binary distribution Build-tools/Do-compile: - merged relevevant changes from 4.0 (Options no-mysqltest, no-benchmark, log_timestamp function) scripts/make_binary_distribution.sh: - make sure to use "gnutar" (on Mac OS X) to pack up the binary distribution (Mac OS X "tar" seems to be buggy - the resulting tarballs appear to be corrupted, e.g. when opening them with Midnight Commander. GNU tar seems to extract them correctly, though) --- scripts/make_binary_distribution.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index d8d34229b70..2e25cc9bdc4 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -189,7 +189,7 @@ which_1 () # Create the result tar file # -tar=`which_1 gtar` +tar=`which_1 gnutar gtar` if test "$?" = "1" -o "$tar" = "" then tar=tar -- cgit v1.2.1 From f9e1f8e2dc0b04d656eaaa3f61120ee5a0d16ec7 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 24 Jan 2003 16:10:21 +0100 Subject: - added mysql_waitpid to the MySQL-client RPM and binary distributions - renamed MySQL.rpm to MySQL-server.rpm scripts/make_binary_distribution.sh: - added mysql_waitpid to binary distribution (required for mysql-test-run) support-files/mysql.spec.sh: - renamed package "MySQL" to "MySQL-server" - fixed Copyright tag - added mysql_waitpid to "client" subpackage (required for mysql-test-run) --- scripts/make_binary_distribution.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index c2b1a0cb2b3..29549e084f0 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -64,7 +64,7 @@ do done for i in extra/comp_err extra/replace extra/perror extra/resolveip \ - extra/my_print_defaults extra/resolve_stack_dump \ + extra/my_print_defaults extra/mysql_waitpid extra/resolve_stack_dump \ isam/isamchk isam/pack_isam myisam/myisamchk \ myisam/myisampack sql/mysqld client/mysqlbinlog \ client/mysql sql/mysqld client/mysqlshow client/mysqlcheck \ -- cgit v1.2.1 From 84f81dc593e8e21cbfb4596aef375d45e3a26ba8 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 28 Jan 2003 08:38:28 +0200 Subject: Fixes for Netware Call pthread_mutex_destroy() on not used mutex. Changed comments in .h and .c files from // -> /* */ Added detection of mutex on which one didn't call pthread_mutex_destroy() Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression" Added optimisation for ORDER BY NULL BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75: Delete: sql/ChangeLog BUILD/compile-pentium-valgrind-max: Don't use valgrind with safemalloc as this can hide some bugs Makefile.am: Added platform dirs bdb/os/os_handle.c: Portability fix client/mysql.cc: Fixes for Netware. Fixed duplicate output when using 'tee' Simple optimisations client/mysqldump.c: Portability fix client/mysqltest.c: Portability fix configure.in: Fixes for Netware extra/resolveip.c: Fixes for Netware include/Makefile.am: Fixes for Netware include/config-win.h: Portability fix include/my_global.h: Fixes for Netware include/my_net.h: Fixes for Netware include/my_pthread.h: Fixes for Netware Added detection of mutexes that was not destroyed include/my_sys.h: Fixes for Netware Added 'extern' before external functions include/mysql.h: Fixes for Netware innobase/configure.in: Fixes for Netware innobase/include/os0thread.h: Fixes for Netware innobase/os/os0sync.c: Fixes for Netware innobase/os/os0thread.c: Fixes for Netware innobase/srv/srv0srv.c: Fixes for Netware innobase/srv/srv0start.c: Fixes for Netware innobase/sync/sync0sync.c: Fixes for Netware isam/test3.c: Disable test on Netware libmysql/Makefile.shared: Added my_sleep libmysql/get_password.c: Fixes for Netware libmysql/libmysql.c: Fixes for Netware Made mysql_once_init() global libmysql/manager.c: Fixes for Netware myisam/mi_test3.c: Disable test for netware mysql-test/mysql-test-run.sh: Give warning if output file contains errors mysql-test/r/count_distinct.result: More tests mysql-test/r/group_by.result: Test of ORDER BY NULL mysql-test/t/backup.test: Fixes for Netware mysql-test/t/count_distinct.test: More tests mysql-test/t/func_crypt.test: Fixes for Netware mysql-test/t/grant_cache.test: Fixes for Netware mysql-test/t/group_by.test: Tests of ORDER BY NULL mysql-test/t/rpl000015.test: Fixes for Netware mysql-test/t/rpl000017.test: Fixes for Netware mysql-test/t/rpl_rotate_logs.test: Fixes for Netware mysys/Makefile.am: Added my_sleep.c and my_netware.c mysys/charset.c: Fixes for Netware mysys/default.c: Fixes for Netware mysys/mf_tempfile.c: Fixes for Netware mysys/my_clock.c: Fixes for Netware mysys/my_copy.c: Fixes for Netware mysys/my_getwd.c: Changed function comment from // -> /* */ mysys/my_init.c: Fixes for Netware mysys/my_lock.c: Fixes for Netware mysys/my_messnc.c: Fixes for Netware mysys/my_os2cond.c: Removed comment mysys/my_os2dirsrch.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2dirsrch.h: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2file64.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2mutex.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2thread.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2tls.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_pthread.c: Fixes for Netware mysys/my_redel.c: Fixes for Netware mysys/my_tempnam.c: Fixes for Netware mysys/my_thr_init.c: Remove created mutexes when program ends. mysys/mysys_priv.h: Cleanup mysys/safemalloc.c: Prefix error messages with "Error:" mysys/thr_alarm.c: Destroy internal mutex on end_thr_alarm. mysys/thr_mutex.c: Added detection of mutex on which one didn't call pthread_mutex_destroy() scripts/make_binary_distribution.sh: Fixes for Netware sql/des_key_file.cc: Free mutex at end sql/ha_innodb.cc: Free mutex at end sql/ha_myisam.cc: Changed warnings from REPAIR Note: (For mysql-test-run) sql/hostname.cc: Fixes for Netware sql/item.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/item_func.cc: Free used mutexes sql/item_sum.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/log.cc: Free used mutexes sql/my_lock.c: Fixes for Netware sql/mysql_priv.h: Fixes for Netware sql/mysqld.cc: Fixes for Netware Added Have_crypt Properly free mutexes from MYSQL_LOG by calling cleanup Free mutex before exit sql/repl_failsafe.cc: Fixes for Netware sql/set_var.cc: Added have_crypt sql/share/english/errmsg.txt: Added version socket and port to stderr log sql/slave.cc: Remove global MASTER_INFO variable and use instead an allocated variable. This allows us to correctly free used mutex. sql/slave.h: Move constructors and destuctors to slave.cc (To make it easier to clear all needed variables) sql/sql_base.cc: Safety fix sql/sql_class.h: Portability fixes. Added 'cleanup' to log handling to be able to free mutexes. sql/sql_insert.cc: Fixes for Netware mysys/my_sleep.c: E sql/sql_parse.cc: Fixes for Netware sql/sql_select.cc: Added optimisation for ORDER BY NULL sql/sql_select.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_table.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_udf.cc: Free mutex on end vio/test-ssl.c: Simple code cleanup vio/test-sslclient.c: Simple code cleanup vio/test-sslserver.c: Simple code cleanup vio/viotest-ssl.c: Simple code cleanup --- scripts/make_binary_distribution.sh | 140 ++++++++++++++++++++++++++---------- 1 file changed, 102 insertions(+), 38 deletions(-) (limited to 'scripts') diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index b7fa94d493c..c4285e7c632 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -46,16 +46,37 @@ if [ -d $BASE ] ; then rm -r -f $BASE fi +BS="" +EXTRA_BIN_FILES="" +BASE_SYSTEM="any" +MYSQL_SHARE=$BASE/share/mysql + +case $system in + *netware*) + BASE_SYSTEM="netware" + BS=".nlm" + MYSQL_SHARE=$BASE/share + EXTRA_BIN_FILES="netware/mysqld_safe.nlm netware/mysql_install_db.nlm \ + netware/init_db.sql netware/test_db.sql netware/mysql_explain_log.nlm \ + netware/mysqlhotcopy.nlm netware/libmysql.nlm" + ;; +esac + + mkdir $BASE $BASE/bin $BASE/data $BASE/data/mysql $BASE/data/test \ - $BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/share/mysql \ - $BASE/tests $BASE/scripts $BASE/sql-bench $BASE/mysql-test \ - $BASE/mysql-test/t $BASE/mysql-test/r \ - $BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/man $BASE/man/man1 - + $BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/scripts \ + $BASE/mysql-test $BASE/mysql-test/t $BASE/mysql-test/r \ + $BASE/mysql-test/include $BASE/mysql-test/std_data + +if [ $BASE_SYSTEM != "netware" ] ; then + mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man $BASE/man/man1 +fi + chmod o-rwx $BASE/data $BASE/data/* for i in ChangeLog COPYING COPYING.LIB README Docs/INSTALL-BINARY \ - MySQLEULA.txt Docs/manual.html Docs/manual.txt Docs/manual_toc.html + MySQLEULA.txt Docs/manual.html Docs/manual.txt Docs/manual_toc.html \ + LICENSE.doc README.NW Docs/mysqlbug.txt do if [ -f $i ] then @@ -63,18 +84,23 @@ do fi done -for i in extra/comp_err extra/replace extra/perror extra/resolveip \ - extra/my_print_defaults extra/resolve_stack_dump \ - isam/isamchk isam/pack_isam myisam/myisamchk \ - myisam/myisampack sql/mysqld client/mysqlbinlog \ - client/mysql sql/mysqld client/mysqlshow client/mysqlcheck \ - client/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \ - client/mysqlmanagerc client/mysqlmanager-pwgen tools/mysqlmanager \ - client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \ - client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest \ - client/.libs/mysqlcheck client/.libs/mysqlbinlog \ - client/.libs/mysqlmanagerc client/.libs/mysqlmanager-pwgen \ - tools/.libs/mysqlmanager +for i in extra/comp_err$BS extra/replace$BS extra/perror$BS \ + extra/resolveip$BS extra/my_print_defaults$BS \ + extra/resolve_stack_dump$BS \ + isam/isamchk$BS isam/pack_isam$BS \ + myisam/myisamchk$BS myisam/myisampack$BS myisam/myisamlog$BS \ + sql/mysqld$BS \ + client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \ + client/mysqldump$BS client/mysqlimport$BS \ + client/mysqltest$BS client/mysqlcheck$BS \ + client/mysqlbinlog$BS client/mysqlmanagerc$BS \ + client/mysqlmanager-pwgen$BS tools/mysqlmanager$BS \ + client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \ + client/.libs/mysqldump client/.libs/mysqlimport \ + client/.libs/mysqltest client/.libs/mysqlcheck \ + client/.libs/mysqlbinlog client/.libs/mysqlmanagerc \ + client/.libs/mysqlmanager-pwgen tools/.libs/mysqlmanager \ + $EXTRA_BIN_FILES do if [ -f $i ] then @@ -86,6 +112,7 @@ if [ x$STRIP = x1 ] ; then strip $BASE/bin/* fi +# Copy not binary files for i in sql/mysqld.sym.gz do if [ -f $i ] @@ -94,7 +121,11 @@ do fi done -for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a libmysqld/.libs/libmysqld.a libmysqld/.libs/libmysqld.so* libmysqld/libmysqld.a +if [ $BASE_SYSTEM = "netware" ] ; then + $CP -r netware/scripts/* $BASE/scripts +fi + +for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a libmysqld/.libs/libmysqld.a libmysqld/.libs/libmysqld.so* libmysqld/libmysqld.a netware/libmysql.imp do if [ -f $i ] then @@ -102,39 +133,72 @@ do fi done +# convert the libs to .lib for NetWare +if [ $BASE_SYSTEM = "netware" ] ; then + for i in $BASE/lib/*.a + do + libname=`basename $i .a` + $MV $i $BASE/lib/$libname.lib + done +fi + $CP config.h include/* $BASE/include -rm $BASE/include/Makefile*; rm $BASE/include/*.in +rm -f $BASE/include/Makefile* $BASE/include/*.in $BASE/include/config-win.h +if [ $BASE_SYSTEM != "netware" ] ; then + rm -f $BASE/include/config-netware.h +fi -$CP tests/*.res tests/*.tst tests/*.pl $BASE/tests +if [ -d tests ] ; then + $CP tests/*.res tests/*.tst tests/*.pl $BASE/tests +fi +if [ -d man ] ; then + $CP man/*.1 $BASE/man/man1 +fi $CP support-files/* $BASE/support-files -$CP man/*.1 $BASE/man/man1 -$CP -r sql/share/* $BASE/share/mysql -rm -f $BASE/share/mysql/Makefile* $BASE/share/mysql/*/*.OLD +if [ $BASE_SYSTEM == "netware" ] ; then + rm -f $BASE/support-files/magic \ + $BASE/support-files/mysql.server \ + $BASE/support-files/mysql*.spec \ + $BASE/support-files/mysql-log-rotate \ + $BASE/support-files/binary-configure +fi + +$CP -r sql/share/* $MYSQL_SHARE +rm -f $MYSQL_SHARE/Makefile* $MYSQL_SHARE/*/*.OLD + +for i in mysql-test/mysql-test-run mysql-test/install_test_db \ + mysql-test/README \ + netware/mysql_test_run.nlm netware/install_test_db.ncf +do + if [ -f $i ] + then + $CP $i $BASE/mysql-test + fi +done -$CP mysql-test/mysql-test-run mysql-test/install_test_db $BASE/mysql-test/ -$CP mysql-test/README $BASE/mysql-test/README $CP mysql-test/include/*.inc $BASE/mysql-test/include $CP mysql-test/std_data/*.dat mysql-test/std_data/*.001 $BASE/mysql-test/std_data -$CP mysql-test/t/*.test mysql-test/t/*.opt mysql-test/t/*.sh $BASE/mysql-test/t -$CP mysql-test/r/*.result mysql-test/r/*.require $BASE/mysql-test/r +$CP mysql-test/t/*test mysql-test/t/*.opt mysql-test/t/*.sh $BASE/mysql-test/t +$CP mysql-test/r/*result mysql-test/r/*.require $BASE/mysql-test/r + +if [ $BASE_SYSTEM != "netware" ] ; then + $CP scripts/* $BASE/bin + $BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db + $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server + $BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/mysqld_safe + mv $BASE/support-files/binary-configure $BASE/configure + chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* $BASE/support-files/mysql.server $BASE/configure + $CP -r sql-bench/* $BASE/sql-bench + rm -f $BASE/sql-bench/*.sh $BASE/sql-bench/Makefile* $BASE/lib/*.la +fi -$CP scripts/* $BASE/bin rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh -$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db -$BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server -$BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/mysqld_safe - # Make safe_mysqld a symlink to mysqld_safe for backwards portability # To be removed in MySQL 4.1 (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld ) -mv $BASE/support-files/binary-configure $BASE/configure -chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* $BASE/support-files/mysql.server $BASE/configure -$CP -r sql-bench/* $BASE/sql-bench -rm -f $BASE/sql-bench/*.sh $BASE/sql-bench/Makefile* $BASE/lib/*.la - # Clean up if we did this from a bk tree if [ -d $BASE/sql-bench/SCCS ] ; then find $BASE/share -name SCCS -print | xargs rm -r -f -- cgit v1.2.1 From b533cd5c83f4a721dba960b97fa94abcad819498 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 28 Jan 2003 20:56:35 +0200 Subject: Only write to the error log if --log-error is specified and --console is not specified (On Windows --log-error is enabled by default) mysys/my_getopt.c: Call get_one_option() also for boolean values. scripts/mysqld_safe.sh: Add option --log-error sql/log.cc: Fix for --log-error sql/mysql_priv.h: Fix for --log-error sql/mysqld.cc: Fix for --log-error sql/sql_udf.cc: Lock the mysql/func table properly --- scripts/mysqld_safe.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index b68c6f56015..0e9f4de09fe 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -47,8 +47,10 @@ parse_arguments() { # mysqld_safe-specific options - must be set in my.cnf ([mysqld_safe])! --ledir=*) ledir=`echo "$arg" | sed -e "s;--ledir=;;"` ;; + # err-log should be removed in 5.0 --err-log=*) err_log=`echo "$arg" | sed -e "s;--err-log=;;"` ;; - # QQ The --open-files should be removed + --log-error=*) err_log=`echo "$arg" | sed -e "s;--log-error=;;"` ;; + # QQ The --open-files should be removed in 5.0 --open-files=*) open_files=`echo "$arg" | sed -e "s;--open-files=;;"` ;; --open-files-limit=*) open_files=`echo "$arg" | sed -e "s;--open-files-limit=;;"` ;; --core-file-size=*) core_file_size=`echo "$arg" | sed -e "s;--core-file-size=;;"` ;; -- cgit v1.2.1 From 7e78a9490b7c17363193f93bfd418fecf5d2826e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Jan 2003 09:22:20 +0100 Subject: - fixed typo for better portability (many shells don't support the "==" operator) --- scripts/make_binary_distribution.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 840ba222302..0773ccc679c 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -156,7 +156,7 @@ if [ -d man ] ; then fi $CP support-files/* $BASE/support-files -if [ $BASE_SYSTEM == "netware" ] ; then +if [ $BASE_SYSTEM = "netware" ] ; then rm -f $BASE/support-files/magic \ $BASE/support-files/mysql.server \ $BASE/support-files/mysql*.spec \ -- cgit v1.2.1