merge

include/my_sys.h: Auto merged sql/item_create.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged innobase/btr/btr0cur.c: Use local file scripts/make_binary_distribution.sh: Add mysql_waitpid sql/mysqld.cc: Simple cleanup
2025-07-30 16:24:05 +03:00 · 2003-01-28 09:02:51 +02:00
parent 3595556335 88b405c4e2
commit c97ddd06f4
121 changed files with 7065 additions and 64246 deletions
--- 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/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 \
-  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 extra/mysql_waitpid$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
@ -196,7 +260,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