Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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.2143 06/02/10 13:50:22 joerg@stripped +15 -0
Several Netware specific fixes.
Originally, done by Jani and pushed to the general 5.1 tree
as ChangeSet 2006/02/02 16:22:31+02:00 jani@stripped
now just copied to the 5.1.6 build clone.
storage/myisam/mi_locking.c
1.43 06/02/10 13:50:15 joerg@stripped +10 -8
Enclosed MMAP related code under HAVE_MMAP preprocessor directive.
storage/innobase/os/os0thread.c
1.31 06/02/10 13:50:15 joerg@stripped +9 -0
Netware specific change to increase the thread stack size.
sql/sql_class.cc
1.242 06/02/10 13:50:15 joerg@stripped +2 -0
Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro.
sql/set_var.cc
1.163 06/02/10 13:50:15 joerg@stripped +3 -2
Minor indending related fix.
sql/mysqld.cc
1.529 06/02/10 13:50:15 joerg@stripped +11 -1
Stacksize change for Netware.
Netware specific change to fix the compilation errors caused by event.h
netware/mysql_test_run.c
1.19 06/02/10 13:50:15 joerg@stripped +13 -6
Netware specific change, added --autoclose option for mysql_test_run.nlm.
netware/my_manage.h
1.5 06/02/10 13:50:15 joerg@stripped +2 -1
Netware specific change required for WINE PATH and for new versions
LibC(Jun 05) and zlib(1.2.3).
((I fail to understand the above comment for this change -
seems just to be a number alignment and a "#define NULL". Joerg))
netware/Makefile.am
1.17 06/02/10 13:50:15 joerg@stripped +7 -4
Netware specific changes to fix to match new
directory structure.
netware/BUILD/nwbootstrap
1.11 06/02/10 13:50:15 joerg@stripped +8 -2
NetWare Specific change to produce absoulte path for XDC file.
netware/BUILD/mwenv
1.13 06/02/10 13:50:15 joerg@stripped +3 -3
Netware specific change required for WINE PATH and for
new versions LibC(Jun 05) and zlib(1.2.3).
netware/BUILD/compile-netware-END
1.8 06/02/10 13:50:15 joerg@stripped +2 -3
Netware specific change for creating mysqld_error.h
netware/BUILD/compile-linux-tools
1.12 06/02/10 13:50:15 joerg@stripped +4 -4
Netware specific change to fix the location where gen_lex_hash
gets created. Fixed also directory structure reflecting changes.
netware/BUILD/compile-AUTOTOOLS
1.5 06/02/10 13:50:15 joerg@stripped +1 -1
Netware specific change reflecting the change in source code
directory structure.
include/config-netware.h
1.15 06/02/10 13:50:15 joerg@stripped +21 -0
NetWare specific change to fix the compilation errors caused by event.h
NetWare specific change required for WINE PATH and for new versions LibC(Jun 05)
and zlib(1.2.3)
configure.in
1.336 06/02/10 13:50:15 joerg@stripped +4 -1
To configure InnoDB for cross compilation.
# 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: joerg
# Host: trift2.
# Root: /M51/clone-5.1
--- 1.335/configure.in 2006-02-07 22:19:18 +01:00
+++ 1.336/configure.in 2006-02-10 13:50:15 +01:00
@@ -2548,9 +2548,12 @@
AC_SUBST(GXX)
# Set configuration options for make_binary_distribution
+
+CONF_ARGS=
case $SYSTEM_TYPE in
*netware*)
MAKE_BINARY_DISTRIBUTION_OPTIONS=--no-strip
+ CONF_ARGS=--host="$MACHINE_TYPE-$SYSTEM_TYPE"
;;
*)
MAKE_BINARY_DISTRIBUTION_OPTIONS=
@@ -2558,7 +2561,7 @@
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-02-10 13:50:15 +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.528/sql/mysqld.cc 2006-02-06 16:36:09 +01:00
+++ 1.529/sql/mysqld.cc 2006-02-10 13:50:15 +01:00
@@ -134,6 +134,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>
@@ -3323,6 +3330,10 @@
mysql_bin_log.purge_logs_before_date(purge_time);
}
#endif
+#ifdef __NETWARE__
+ /* Increasing stacksize of threads on NetWare */
+ pthread_attr_setstacksize(&connection_attrib, NW_THD_STACKSIZE);
+#endif
if (opt_myisam_log)
(void) mi_log(1);
@@ -3556,7 +3567,6 @@
#endif
#ifdef __NETWARE__
/* Increasing stacksize of threads on NetWare */
-
pthread_attr_setstacksize(&connection_attrib, NW_THD_STACKSIZE);
#endif
--- 1.241/sql/sql_class.cc 2006-01-24 13:33:58 +01:00
+++ 1.242/sql/sql_class.cc 2006-02-10 13:50:15 +01:00
@@ -2264,6 +2264,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.
@@ -2282,6 +2283,7 @@
THD::binlog_prepare_pending_rows_event(TABLE*, uint32, MY_BITMAP const*,
my_size_t colcnt, my_size_t, bool,
Update_rows_log_event *);
+#endif
static char const*
field_type_name(enum_field_types type)
{
--- 1.4/netware/BUILD/compile-AUTOTOOLS 2003-07-08 15:29:13 +02:00
+++ 1.5/netware/BUILD/compile-AUTOTOOLS 2006-02-10 13:50:15 +01:00
@@ -6,7 +6,7 @@
# stop on errors
set -e
-for package in . ./innobase
+for package in . ./storage/innobase
do
(cd $package
rm -rf config.cache autom4te.cache
--- 1.11/netware/BUILD/compile-linux-tools 2006-01-12 19:30:55 +01:00
+++ 1.12/netware/BUILD/compile-linux-tools 2006-02-10 13:50:15 +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)
@@ -57,7 +57,7 @@
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 sql/.libs/gen_lex_hash sql/gen_lex_hash.linux
+cp sql/gen_lex_hash sql/gen_lex_hash.linux
cp strings/conf_to_src strings/conf_to_src.linux
# Delete mysql_version.h
--- 1.7/netware/BUILD/compile-netware-END 2005-10-28 10:48:09 +02:00
+++ 1.8/netware/BUILD/compile-netware-END 2006-02-10 13:50:15 +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-02-10 13:50:15 +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-02-10 13:50:15 +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-02-10 13:50:15 +01:00
@@ -54,7 +54,8 @@
#define ARG_BUF 10
-#define TRY_MAX 5
+#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-02-10 13:50:15 +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.30/storage/innobase/os/os0thread.c 2006-01-16 14:26:28 +01:00
+++ 1.31/storage/innobase/os/os0thread.c 2006-02-10 13:50:15 +01:00
@@ -157,6 +157,15 @@
exit(1);
}
#endif
+#ifdef __NETWARE__
+ ret = pthread_attr_setstacksize(&attr,
+ (size_t)NW_THD_STACKSIZE);
+ if (ret) {
+ fprintf(stderr,
+ "InnoDB: Error: pthread_attr_setstacksize returned %d\n", ret);
+ exit(1);
+ }
+#endif
os_mutex_enter(os_sync_mutex);
os_thread_count++;
os_mutex_exit(os_sync_mutex);
--- 1.14/include/config-netware.h 2006-01-12 19:07:03 +01:00
+++ 1.15/include/config-netware.h 2006-02-10 13:50:15 +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-02-10 13:50:15 +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; \
--- 1.162/sql/set_var.cc 2006-01-30 13:09:02 +01:00
+++ 1.163/sql/set_var.cc 2006-02-10 13:50:15 +01:00
@@ -215,8 +215,9 @@
&delayed_insert_timeout);
sys_var_long_ptr sys_delayed_queue_size("delayed_queue_size",
&delayed_queue_size);
-sys_var_event_executor sys_event_executor("event_scheduler",
- (my_bool *)&event_executor_running_global_var);
+sys_var_event_executor sys_event_executor("event_scheduler",
+ (my_bool *)
+ &event_executor_running_global_var);
sys_var_long_ptr sys_expire_logs_days("expire_logs_days",
&expire_logs_days);
sys_var_bool_ptr sys_flush("flush", &myisam_flush);
| Thread |
|---|
| • bk commit into 5.1 tree (joerg:1.2143) | Joerg Bruehe | 10 Feb |
