From 300b3fb64280ae3d982745b683029a2722b3daef Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 17 Feb 2003 02:14:37 +0200 Subject: Fixed multi-table-delete for InnoDB tables Novell patches Makefile.am: Novell patch client/mysql.cc: Novell patch configure.in: Novell patch extra/mysql_waitpid.c: Novell patch include/my_pthread.h: Novell patch include/mysql.h: Novell patch libmysql/libmysql.c: Novell patch libmysqld/libmysqld.c: Novell patch mysql-test/mysql-test-run.sh: Don't use running server with --valgrind mysql-test/r/innodb.result: Updated results mysql-test/r/rpl000001.result: Updated results mysql-test/r/rpl000004.result: Updated results mysql-test/r/rpl_log.result: Updated results mysql-test/r/type_blob.result: Updated results mysql-test/std_data/words.dat: Added more words to make type_blob test relevant mysql-test/t/innodb.test: test of multi-table-delete mysql-test/t/rpl000001.test: Update for new word file mysql-test/t/type_blob.test: Test if BLOB IS NULL on NOT NULL column mysys/my_init.c: Novell patch mysys/my_netware.c: Novell patch netware/Makefile.am: Novell patch netware/init_db.sql: Novell patch netware/isamchk.def: Novell patch netware/isamlog.def: Novell patch netware/libmysql.def: Novell patch netware/my_print_defaults.def: Novell patch netware/myisamchk.def: Novell patch netware/myisamlog.def: Novell patch netware/myisampack.def: Novell patch netware/mysql.def: Novell patch netware/mysql_install_db.c: Novell patch netware/mysql_install_db.def: Novell patch netware/mysql_test_run.def: Novell patch netware/mysqladmin.def: Novell patch netware/mysqlbinlog.def: Novell patch netware/mysqlcheck.def: Novell patch netware/mysqld_safe.c: Novell patch netware/mysqldump.def: Novell patch netware/mysqlimport.def: Novell patch netware/mysqlshow.def: Novell patch netware/mysqltest.def: Novell patch netware/pack_isam.def: Novell patch netware/perror.def: Novell patch netware/replace.def: Novell patch netware/resolveip.def: Novell patch netware/test_db.sql: Novell patch scripts/make_binary_distribution.sh: Novell patch sql/item_cmpfunc.h: Optimization of 'IS NULL' sql/mysql_priv.h: Code cleanup sql/mysqld.cc: Novell patch sql/net_pkg.cc: Code cleanup sql/records.cc: Fixed multi-table-delete for InnoDB tables sql/sql_delete.cc: Fixed multi-table-delete for InnoDB tables sql/sql_handler.cc: Code cleanup sql/sql_table.cc: Code cleanup sql/structs.h: Fixed multi-table-delete for InnoDB tables --- configure.in | 61 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 26 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index d4f749d5de7..093abc7e983 100644 --- a/configure.in +++ b/configure.in @@ -38,10 +38,10 @@ rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES for i in $AVAILABLE_LANGUAGES do AVAILABLE_LANGUAGES_ERRORS="$AVAILABLE_LANGUAGES_ERRORS $i/errmsg.sys" - case $SYSTEM_TYPE in - *netware* | *modesto*) + case $host_os in + netware* | modesto*) echo "$i/errmsg.sys: $i/errmsg.txt - \$(top_builddir)/extra/comp_err.cyg \$^ $i/errmsg.sys" \ + \$(top_builddir)/extra/comp_err.linux \$^ $i/errmsg.sys" \ >> $AVAILABLE_LANGUAGES_ERRORS_RULES ;; *) @@ -1067,7 +1067,10 @@ dnl Is this the right match for DEC OSF on alpha? *netware*) # No need for curses library so set it to null with_named_curses="" - PLATFORM_NETWARE=yes + + # No thread library - in LibC + with_named_thread="" + # # Edit Makefile.in files. # @@ -1089,36 +1092,36 @@ dnl Is this the right match for DEC OSF on alpha? fi case $file in sql/Makefile.in) - # Use gen_lex_hash.cyg instead of gen_lex_hash + # Use gen_lex_hash.linux instead of gen_lex_hash # Add library dependencies to mysqld_DEPENDENCIES lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs)" cat > $filesed << EOF s,\(^.*\$(MAKE) gen_lex_hash\),#\1, -s,\(\./gen_lex_hash\),\1.cyg, +s,\(\./gen_lex_hash\),\1.linux, s%\(mysqld_DEPENDENCIES = \) %\1$lib_DEPENDENCIES % EOF ;; sql/share/Makefile.in) cat > $filesed << EOF -s,\(extra/comp_err\),\1.cyg, +s,\(extra/comp_err\),\1.linux, EOF ;; libmysql/Makefile.in) cat > $filesed << EOF -s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.cyg\2, -s,\(: conf_to_src\),\1.cyg, +s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2, +s,\(: conf_to_src\),\1.linux, EOF ;; libmysql_r/Makefile.in) cat > $filesed << EOF -s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.cyg\2, -s,\(: conf_to_src\),\1.cyg, +s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2, +s,\(: conf_to_src\),\1.linux, EOF ;; strings/Makefile.in) cat > $filesed << EOF -s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.cyg\2, -s,\(: conf_to_src\),\1.cyg, +s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2, +s,\(: conf_to_src\),\1.linux, EOF ;; client/Makefile.in) @@ -1167,7 +1170,6 @@ EOF ;; esac -AM_CONDITIONAL(PLATFORM_NETWARE, test "$PLATFORM_NETWARE" = "yes") #---START: Used in for client configure # Check if we threads are in libc or if we should use @@ -2195,13 +2197,6 @@ AC_ARG_WITH(extra-charsets, [extra_charsets="$withval"], [extra_charsets="none"]) -AC_ARG_WITH(platform-dir, - [ --with-platform-dir=DIR - Add specified directory to list of SUBDIRS to build.], - [ with_platform_dir=$withval ], - [ with_platform_dir=no ] - ) - AC_MSG_CHECKING("character sets") if test "$extra_charsets" = none; then @@ -2440,12 +2435,15 @@ AC_SUBST(CLIENT_LIBS) AC_SUBST(sql_client_dirs) AC_SUBST(linked_client_targets) -platform_dir= -if test "$with_platform_dir" != "no" -then - platform_dir="$with_platform_dir" +# If configuring for NetWare, set up to link sources from and build the netware directory +netware_dir= +linked_netware_sources= +if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then + netware_dir="netware" + linked_netware_sources="linked_netware_sources" fi -AC_SUBST(platform_dir) +AC_SUBST(netware_dir) +AC_SUBST(linked_netware_sources) if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no" then @@ -2612,6 +2610,17 @@ AC_SUBST(GXX) #Remove TOOLS_LIBS, because this is included in LIBRARIES #AC_SUBST(TOOLS_LIBS) +# Set configuration options for make_binary_distribution +case $SYSTEM_TYPE in + *netware*) + MAKE_BINARY_DISTRIBUTION_OPTIONS=--no-strip + ;; + *) + MAKE_BINARY_DISTRIBUTION_OPTIONS= + ;; +esac +AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) + # Output results AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl strings/Makefile regex/Makefile heap/Makefile dnl -- cgit v1.2.1