List:Commits« Previous MessageNext Message »
From:jani Date:January 30 2006 8:01am
Subject:bk commit into 5.1 tree (jani:1.2034)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mysqldev. When mysqldev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2034 06/01/30 09:01:46 jani@stripped +13 -0
  Netware specific local changes for 5.1.5-alpha.
  These are not applied to main source tree at this point.

  storage/myisam/mi_locking.c
    1.43 06/01/30 09:01:40 jani@stripped +10 -8
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  sql/sql_class.cc
    1.234 06/01/30 09:01:40 jani@stripped +1 -0
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  sql/mysqld.cc
    1.515 06/01/30 09:01:39 jani@stripped +7 -0
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  netware/mysql_test_run.c
    1.19 06/01/30 09:01:39 jani@stripped +13 -6
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  netware/my_manage.h
    1.5 06/01/30 09:01:39 jani@stripped +1 -0
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  netware/Makefile.am
    1.17 06/01/30 09:01:39 jani@stripped +7 -4
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  netware/BUILD/nwbootstrap
    1.11 06/01/30 09:01:39 jani@stripped +8 -2
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  netware/BUILD/mwenv
    1.13 06/01/30 09:01:39 jani@stripped +3 -3
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  netware/BUILD/compile-netware-END
    1.8 06/01/30 09:01:39 jani@stripped +2 -3
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  netware/BUILD/compile-linux-tools
    1.11 06/01/30 09:01:39 jani@stripped +3 -3
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  netware/BUILD/compile-AUTOTOOLS
    1.6 06/01/30 09:01:39 jani@stripped +1 -1
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  include/config-netware.h
    1.14 06/01/30 09:01:39 jani@stripped +21 -0
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

  configure.in
    1.331 06/01/30 09:01:39 jani@stripped +4 -2
    Netware specific local changes for 5.1.5-alpha.
    These are not applied to main source tree at this point.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	suse9-x86.mysql.com
# Root:	/home/mysqldev/mydev/mysql-5.1.5-alpha-build

--- 1.330/configure.in	2005-12-31 10:13:33 +01:00
+++ 1.331/configure.in	2006-01-30 09:01:39 +01:00
@@ -7,7 +7,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.1.5-alpha)
+AM_INIT_AUTOMAKE(mysql, 5.1.5a-alpha)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -2551,14 +2551,16 @@
 case $SYSTEM_TYPE in
   *netware*)
     MAKE_BINARY_DISTRIBUTION_OPTIONS=--no-strip
+    CONF_ARGS=--host="$MACHINE_TYPE-$SYSTEM_TYPE"
     ;;
   *)
     MAKE_BINARY_DISTRIBUTION_OPTIONS=
+    CONF_ARGS=
     ;;
 esac
 
 for CONF in $other_configures; do
-  (cd `dirname $CONF`; ./`basename $CONF` --build=$build_alias)
+  (cd `dirname $CONF`; ./`basename $CONF` $CONF_ARGS --build=$build_alias)
 done
 
 AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)

--- 1.42/storage/myisam/mi_locking.c	2005-12-28 13:05:20 +01:00
+++ 1.43/storage/myisam/mi_locking.c	2006-01-30 09:01:40 +01:00
@@ -84,14 +84,16 @@
 			   (uint) share->changed, share->w_locks));
 	if (share->changed && !share->w_locks)
 	{
-          if (info->s->mmaped_length != info->s->state.state.data_file_length)
-          {
-            if (info->s->concurrent_insert)
-              rw_wrlock(&info->s->mmap_lock);
-            mi_remap_file(info, info->s->state.state.data_file_length);
-            if (info->s->concurrent_insert)
-              rw_unlock(&info->s->mmap_lock);
-          }
+#ifdef HAVE_MMAP
+    if (info->s->mmaped_length != info->s->state.state.data_file_length)
+    {
+      if (info->s->concurrent_insert)
+        rw_wrlock(&info->s->mmap_lock);
+      mi_remap_file(info, info->s->state.state.data_file_length);
+      if (info->s->concurrent_insert)
+        rw_unlock(&info->s->mmap_lock);
+    }
+#endif
 	  share->state.process= share->last_process=share->this_process;
 	  share->state.unique=   info->last_unique=  info->this_unique;
 	  share->state.update_count= info->last_loop= ++info->this_loop;

--- 1.514/sql/mysqld.cc	2006-01-07 14:49:40 +01:00
+++ 1.515/sql/mysqld.cc	2006-01-30 09:01:39 +01:00
@@ -133,6 +133,13 @@
 #define zVOLSTATE_DEACTIVE 2
 #define zVOLSTATE_MAINTENANCE 3
 
+#undef __event_h__
+#include <../include/event.h>
+/*
+  This #undef exists here because both libc of NetWare and MySQL have
+  files named event.h which causes compilation errors.
+*/
+
 #include <nks/netware.h>
 #include <nks/vm.h>
 #include <library.h>

--- 1.233/sql/sql_class.cc	2006-01-10 10:35:37 +01:00
+++ 1.234/sql/sql_class.cc	2006-01-30 09:01:40 +01:00
@@ -2234,6 +2234,7 @@
   return pending;              /* This is the current pending event */
 }
 
+#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
 /*
   Instansiate the versions we need, we have -fno-implicit-template as
   compiling option.

--- 1.5/netware/BUILD/compile-AUTOTOOLS	2006-01-30 02:02:01 +01:00
+++ 1.6/netware/BUILD/compile-AUTOTOOLS	2006-01-30 09:01:39 +01:00
@@ -6,7 +6,7 @@
 # stop on errors
 set -e
 
-for package in .
+for package in . ./storage/innobase
 do
 	(cd $package
 	rm -rf config.cache autom4te.cache

--- 1.10/netware/BUILD/compile-linux-tools	2005-12-13 17:44:14 +01:00
+++ 1.11/netware/BUILD/compile-linux-tools	2006-01-30 09:01:39 +01:00
@@ -37,11 +37,11 @@
 (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)

--- 1.7/netware/BUILD/compile-netware-END	2005-10-28 10:48:09 +02:00
+++ 1.8/netware/BUILD/compile-netware-END	2006-01-30 09:01:39 +01:00
@@ -22,9 +22,8 @@
 . $path/compile-AUTOTOOLS
 
 # For NetWare there is no comp_err but comp_err.linux
-sed -e "s/comp_err/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$
-sed -e "s/replace comp_err.linux/replace comp_err/g" extra/Makefile.am.$$ > extra/Makefile.am
-rm extra/Makefile.am.$$
+sed -e "s/comp_err\$(EXEEXT)/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$
+mv extra/Makefile.am.$$ extra/Makefile.am
 
 # configure
 ./configure $base_configs $extra_configs

--- 1.12/netware/BUILD/mwenv	2005-10-13 17:23:47 +02:00
+++ 1.13/netware/BUILD/mwenv	2006-01-30 09:01:39 +01:00
@@ -4,10 +4,10 @@
 # This values are normally changed by the nwbootstrap script
 
 # the default is "F:/mydev"
-export MYDEV="F:/mydev"
+export MYDEV=WINE_BUILD_DIR
 
-export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$MYDEV/mysql-VERSION/include;$MYDEV"
-export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.1.4;$MYDEV/openssl;$MYDEV/mysql-VERSION/netware/BUILD"
+export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.2.3;$MYDEV/mysql-VERSION/include;$MYDEV"
+export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.2.3;$MYDEV/openssl;$MYDEV/mysql-VERSION/netware/BUILD"
 export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;neb.imp;zPublics.imp;knetware.imp"
 
 export WINEPATH="$MYDEV/mw/bin"

--- 1.10/netware/BUILD/nwbootstrap	2005-08-19 20:55:19 +02:00
+++ 1.11/netware/BUILD/nwbootstrap	2006-01-30 09:01:39 +01:00
@@ -160,6 +160,11 @@
   -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 @@
 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..."

--- 1.4/netware/my_manage.h	2004-05-26 16:10:52 +02:00
+++ 1.5/netware/my_manage.h	2006-01-30 09:01:39 +01:00
@@ -55,6 +55,7 @@
 
 #define ARG_BUF			10
 #define TRY_MAX			5
+#define NULL        (char )0
 
 #ifdef __NETWARE__
 #define strstr(A,B) strindex(A,B)

--- 1.18/netware/mysql_test_run.c	2005-12-04 19:57:28 +01:00
+++ 1.19/netware/mysql_test_run.c	2006-01-30 09:01:39 +01:00
@@ -1189,7 +1189,7 @@
 ******************************************************************************/
 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 +1236,22 @@
   {
     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 +1303,8 @@
   if (log_fd) fclose(log_fd);
 
   // keep results up
-  pressanykey();
+  if (!autoclose)
+    pressanykey();
 
   return 0;
 }

--- 1.13/include/config-netware.h	2005-12-24 14:32:38 +01:00
+++ 1.14/include/config-netware.h	2006-01-30 09:01:39 +01:00
@@ -19,6 +19,14 @@
 #ifndef _config_netware_h
 #define _config_netware_h
 
+#define __event_h__
+#define _EVENT_H_
+/* 
+  These two #define(s) are needed as both libc of NetWare and MySQL have 
+  files named event.h which causes compilation errors.
+*/
+
+
 /* required headers */
 #include <unistd.h>
 #include <stdio.h>
@@ -35,6 +43,12 @@
 #include <pthread.h>
 #include <termios.h>
 
+#undef _EVENT_H_
+/* 
+  This #undef exists here because both libc of NetWare and MySQL have 
+  files named event.h which causes compilation errors.
+*/
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -64,6 +78,13 @@
 #undef HAVE_READLINK
 #undef HAVE_STPCPY
 /* changes  end  */
+
+/* Changes made to make use of LibC-June-2005 for building purpose */
+#undef HAVE_GETPASS
+#undef HAVE_GETRLIMIT
+#undef HAVE_GETRUSAGE
+#undef HAVE_INITGROUPS
+/* Changes  end  - LibC-June-2005 */
 
 /* no libc crypt() function */
 #ifdef HAVE_OPENSSL

--- 1.16/netware/Makefile.am	2005-12-18 20:16:19 +01:00
+++ 1.17/netware/Makefile.am	2006-01-30 09:01:39 +01:00
@@ -30,13 +30,16 @@
                                 client/mysqldump.def client/mysqlimport.def \
                                 client/mysqlshow.def client/mysqltest.def \
                                 client/mysqlslap.def \
+                                sql/mysqld.def extra/mysql_waitpid.def \
                                 extra/mysql_install.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; \
Thread
bk commit into 5.1 tree (jani:1.2034)jani30 Jan