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@stripped, 2006-08-14 19:09:35+02:00, jani@stripped +4 -0
compile-AUTOTOOLS:
Disabled DIST_COMMON for Netware builds
config-netware.h:
added include from new libc to enable mmap
compile-netware-START:
Enabled csv for Netware
configure.in:
Changed version number
configure.in@stripped, 2006-08-14 19:08:55+02:00, jani@stripped +1 -1
Changed version number
include/config-netware.h@stripped, 2006-08-14 19:03:59+02:00, jani@stripped +1 -1
added include from new libc to enable mmap
netware/BUILD/compile-AUTOTOOLS@stripped, 2006-08-14 19:08:36+02:00, jani@stripped +3 -1
Disabled DIST_COMMON for Netware builds
netware/BUILD/compile-netware-START@stripped, 2006-08-14 19:09:22+02:00, jani@stripped +1 -1
Enabled csv for Netware
# 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: /data0/mydev/mysql-5.1.11-build
--- 1.355/configure.in 2006-08-14 19:09:43 +02:00
+++ 1.356/configure.in 2006-08-14 19:09:43 +02: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.11-beta)
+AM_INIT_AUTOMAKE(mysql, 5.1.11a-beta)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
--- 1.6/netware/BUILD/compile-AUTOTOOLS 2006-08-14 19:09:43 +02:00
+++ 1.7/netware/BUILD/compile-AUTOTOOLS 2006-08-14 19:09:43 +02:00
@@ -5,6 +5,8 @@
# stop on errors
set -e
+sed -e "s/^DIST_COMMON/#DIST_COMMON/g" storage/ndb/Makefile.am > storage/ndb/Makefile.am.$$
+mv storage/ndb/Makefile.am.$$ storage/ndb/Makefile.am
for package in . ./storage/innobase
do
@@ -14,7 +16,7 @@
autoheader
libtoolize --force
aclocal
- automake --add-missing --force-missing
+ automake --verbose --add-missing --force-missing
autoconf)
done
--- 1.7/netware/BUILD/compile-netware-START 2006-08-14 19:09:43 +02:00
+++ 1.8/netware/BUILD/compile-netware-START 2006-08-14 19:09:43 +02:00
@@ -24,5 +24,5 @@
--prefix=N:/mysql \
--without-mysqlmanager \
--without-man \
- --without-csv-storage-engine \
"
+# --without-csv-storage-engine \
--- 1.16/include/config-netware.h 2006-08-14 19:09:43 +02:00
+++ 1.17/include/config-netware.h 2006-08-14 19:09:43 +02:00
@@ -42,6 +42,7 @@
#include <sys/time.h>
#include <pthread.h>
#include <termios.h>
+#include <sys/select.h>
#undef _EVENT_H_
/*
@@ -59,7 +60,6 @@
#undef HAVE_SCHED_H
#undef HAVE_SYS_MMAN_H
#undef HAVE_SYNCH_H
-#undef HAVE_MMAP
#undef HAVE_RINT
#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
| Thread |
|---|
| • bk commit into 5.1 tree (jani:1.2187) | jani | 14 Aug |
