Commit 12046696 authored by unknown's avatar unknown
Browse files

Minor Netware specific changes. 


netware/BUILD/compile-linux-tools:
  Fixed compilation problem with Linux tools.
scripts/make_binary_distribution.sh:
  Netware specific changes. Discard platform
  specific files and added a couple of missing files.
sql/tztime.cc:
  Code not ported to Netware yet.
parent 4fc6562f

netware/BUILD/compile-linux-tools

+3 −2
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ rm -f */*.linux 
./configure --without-innodb --without-docs



# build	tools only

make clean all-local

make clean

make

(cd dbug; make libdbug.a)

(cd strings; make libmystrings.a)

(cd mysys; make libmysys.a)
@@ -53,7 +54,7 @@ make clean all-local 
# copying required linux tools

cp extra/comp_err extra/comp_err.linux

cp libmysql/conf_to_src libmysql/conf_to_src.linux

cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux

#cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux

cp sql/gen_lex_hash sql/gen_lex_hash.linux

cp strings/conf_to_src strings/conf_to_src.linux

scripts/make_binary_distribution.sh

+4 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then 
      libname=`basename $i .a`

      $MV $i $BASE/lib/$libname.lib

    done

    rm -f $BASE/lib/*.la

fi



copyfileto $BASE/include config.h include/*
@@ -266,6 +267,9 @@ if [ $BASE_SYSTEM = "netware" ] ; then 
        $BASE/support-files/mysql*.spec \

        $BASE/support-files/mysql-log-rotate \

        $BASE/support-files/binary-configure \

        $BASE/support-files/build-tags \

	$BASE/support-files/MySQL-shared-compat.spec \

        $BASE/support-files/ndb-config-2-node.ini \

        $BASE/INSTALL-BINARY \

        $BASE/MySQLEULA.txt

else

sql/tztime.cc

+5 −0
Original line number Diff line number Diff line
@@ -2359,6 +2359,7 @@ scan_tz_dir(char * name_end) 
int

main(int argc, char **argv)

{

#ifndef __NETWARE__

  MY_INIT(argv[0]);



  if (argc != 2 && argc != 3)
@@ -2417,6 +2418,10 @@ main(int argc, char **argv) 
    free_root(&tz_storage, MYF(0));

  }



#else

  fprintf(stderr, "This tool has not been ported to NetWare\n");

#endif /* __NETWARE__ */



  return 0;

}