Below is the list of changes that have just been committed into a local
5.1 repository of brian. When brian 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.2314 06/04/10 16:41:09 brian@zim.(none) +43 -0
Drop a number of OS2 specific files.
mysys/Makefile.am
1.75 06/04/10 16:41:03 brian@zim.(none) +1 -4
Removed OS2 specific files.
include/my_global.h
1.125 06/04/10 16:41:03 brian@zim.(none) +0 -9
Removed OS2 specific files.
include/Makefile.am
1.64 06/04/10 16:41:03 brian@zim.(none) +1 -1
Removed os2 specific config file.
configure.in
1.359 06/04/10 16:41:03 brian@zim.(none) +0 -1
Removed OS2 specific os2 files.
Makefile.am
1.85 06/04/10 16:41:03 brian@zim.(none) +1 -1
Removed os2 reference
BitKeeper/deleted/.del-my_os2tls.c~58ade7a0f70ad5ea
1.4 06/04/10 13:42:27 brian@zim.(none) +0 -0
Delete: mysys/my_os2tls.c
BitKeeper/deleted/.del-my_os2thread.c~65dca991548cec2a
1.6 06/04/10 13:42:27 brian@zim.(none) +0 -0
Delete: mysys/my_os2thread.c
BitKeeper/deleted/.del-my_os2mutex.c~79f7438bfde5132a
1.4 06/04/10 13:42:26 brian@zim.(none) +0 -0
Delete: mysys/my_os2mutex.c
BitKeeper/deleted/.del-my_os2file64.c~251fb8a1e950c31b
1.6 06/04/10 13:42:26 brian@zim.(none) +0 -0
Delete: mysys/my_os2file64.c
BitKeeper/deleted/.del-my_os2dlfcn.h0~eae8edb8555eff87
1.2 06/04/10 13:42:26 brian@zim.(none) +0 -0
Delete: mysys/my_os2dlfcn.h0
BitKeeper/deleted/.del-my_os2dlfcn.c~6d94b488717683dd
1.3 06/04/10 13:42:25 brian@zim.(none) +0 -0
Delete: mysys/my_os2dlfcn.c
BitKeeper/deleted/.del-my_os2dirsrch.h~5011cbc657537d0
1.4 06/04/10 13:42:25 brian@zim.(none) +0 -0
Delete: mysys/my_os2dirsrch.h
BitKeeper/deleted/.del-my_os2dirsrch.c~4e2479b2abb2eb5a
1.4 06/04/10 13:42:24 brian@zim.(none) +0 -0
Delete: mysys/my_os2dirsrch.c
BitKeeper/deleted/.del-my_os2cond.c~e3b520af1c371bb5
1.6 06/04/10 13:42:24 brian@zim.(none) +0 -0
Delete: mysys/my_os2cond.c
BitKeeper/deleted/.del-config-os2.h~a16b51851ddd317b
1.6 06/04/10 13:39:34 brian@zim.(none) +0 -0
Delete: include/config-os2.h
BitKeeper/deleted/.del-file.h~90a5c4f6c7dfb5a
1.2 06/04/10 12:42:36 brian@zim.(none) +0 -0
Delete: os2/include/sys/file.h
BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c
1.2 06/04/10 12:42:36 brian@zim.(none) +0 -0
Delete: os2/include/sys/Makefile.am
BitKeeper/deleted/.del-termio.h~b136a899c396cb69
1.2 06/04/10 12:41:56 brian@zim.(none) +0 -0
Delete: os2/include/termio.h
BitKeeper/deleted/.del-sgtty.h~4321c310847cb55c
1.2 06/04/10 12:41:56 brian@zim.(none) +0 -0
Delete: os2/include/sgtty.h
BitKeeper/deleted/.del-pwd.h~b26f27954da3a1be
1.2 06/04/10 12:41:55 brian@zim.(none) +0 -0
Delete: os2/include/pwd.h
BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f
1.2 06/04/10 12:41:55 brian@zim.(none) +0 -0
Delete: os2/include/Makefile.am
BitKeeper/deleted/.del-config.h~1e58e9b6b3735392
1.2 06/04/10 12:41:54 brian@zim.(none) +0 -0
Delete: os2/include/config.h
BitKeeper/deleted/.del-rint.s~82358ca146718a12
1.2 06/04/10 12:41:42 brian@zim.(none) +0 -0
Delete: os2/rint.s
BitKeeper/deleted/.del-rint.obj~e6bbb137ffb2f3d1
1.3 06/04/10 12:41:42 brian@zim.(none) +0 -0
Delete: os2/rint.obj
BitKeeper/deleted/.del-rint.cmd~49a7df1e6a4214af
1.2 06/04/10 12:41:41 brian@zim.(none) +0 -0
Delete: os2/rint.cmd
BitKeeper/deleted/.del-ReadMe.txt~573b1e4ebab241e1
1.3 06/04/10 12:41:41 brian@zim.(none) +0 -0
Delete: os2/ReadMe.txt
BitKeeper/deleted/.del-mysql.wis~95ebdebeb470c823
1.2 06/04/10 12:41:40 brian@zim.(none) +0 -0
Delete: os2/mysql.wis
BitKeeper/deleted/.del-MySQL-Util.irs~cc5eb078dbc0605c
1.3 06/04/10 12:41:40 brian@zim.(none) +0 -0
Delete: os2/MySQL-Util.irs
BitKeeper/deleted/.del-MySQL-Util.icc~e6288097ceb9cbd2
1.5 06/04/10 12:41:39 brian@zim.(none) +0 -0
Delete: os2/MySQL-Util.icc
BitKeeper/deleted/.del-MySQL-Sql.irs~266e93e2c9003567
1.2 06/04/10 12:41:39 brian@zim.(none) +0 -0
Delete: os2/MySQL-Sql.irs
BitKeeper/deleted/.del-MySQL-Sql.icc~2ec2a87f4a096d31
1.5 06/04/10 12:41:39 brian@zim.(none) +0 -0
Delete: os2/MySQL-Sql.icc
BitKeeper/deleted/.del-MySQL-Source.icc~edded3c3a5cf83b1
1.6 06/04/10 12:41:38 brian@zim.(none) +0 -0
Delete: os2/MySQL-Source.icc
BitKeeper/deleted/.del-MySQL-Opt.icc~b9517e18e6cf6c05
1.4 06/04/10 12:41:38 brian@zim.(none) +0 -0
Delete: os2/MySQL-Opt.icc
BitKeeper/deleted/.del-mysqlalt.wis~409d76f4dfd1e4c4
1.2 06/04/10 12:41:37 brian@zim.(none) +0 -0
Delete: os2/mysqlalt.wis
BitKeeper/deleted/.del-mysql-inf.wis~fce577336b6bb0e
1.2 06/04/10 12:41:37 brian@zim.(none) +0 -0
Delete: os2/mysql-inf.wis
BitKeeper/deleted/.del-MySQL-Client.icc~1d41cb9ed34c28ce
1.4 06/04/10 12:41:37 brian@zim.(none) +0 -0
Delete: os2/MySQL-Client.icc
BitKeeper/deleted/.del-build-all.cmd~68479264bb9abe
1.3 06/04/10 12:41:36 brian@zim.(none) +0 -0
Delete: os2/build-all.cmd
BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713
1.3 06/04/10 12:41:36 brian@zim.(none) +0 -0
Delete: os2/Makefile.am
BitKeeper/deleted/.del-ChangeLog.os2~c473e6f17539eb4
1.5 06/04/10 12:41:36 brian@zim.(none) +0 -0
Delete: os2/ChangeLog.os2
BitKeeper/deleted/.del-BldLevel.rc~fdab305a1b550012
1.3 06/04/10 12:41:35 brian@zim.(none) +0 -0
Delete: os2/BldLevel.rc
BitKeeper/deleted/.del-BldLevel.RES~6701a23a4d0b0f33
1.2 06/04/10 12:41:35 brian@zim.(none) +0 -0
Delete: os2/BldLevel.RES
BitKeeper/deleted/.del-BldLevelInf.cmd~49e29c82b3527c4a
1.2 06/04/10 12:41:34 brian@zim.(none) +0 -0
Delete: os2/BldLevelInf.cmd
BitKeeper/deleted/.del-BldLevel.cmd~d1a41ef0712190e1
1.3 06/04/10 12:41:34 brian@zim.(none) +0 -0
Delete: os2/BldLevel.cmd
# 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: brian
# Host: zim.(none)
# Root: /home/brian/mysql/dep-5.1
--- 1.84/Makefile.am 2006-03-30 01:02:48 -08:00
+++ 1.85/Makefile.am 2006-04-10 16:41:03 -07:00
@@ -37,7 +37,7 @@
strings mysys dbug extra regex storage \
vio sql libmysql_r libmysql client scripts \
@man_dirs@ tests SSL\
- BUILD netware os2 @libmysqld_dirs@\
+ BUILD netware @libmysqld_dirs@\
@bench_dirs@ support-files server-tools tools \
plugin win
--- 1.358/configure.in 2006-04-07 05:53:42 -07:00
+++ 1.359/configure.in 2006-04-10 16:41:03 -07:00
@@ -2604,7 +2604,6 @@
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl
storage/myisam/Makefile storage/myisammrg/Makefile dnl
- os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
man/Makefile BUILD/Makefile vio/Makefile dnl
libmysql/Makefile client/Makefile dnl
pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
--- 1.63/include/Makefile.am 2006-02-24 13:20:42 -08:00
+++ 1.64/include/Makefile.am 2006-04-10 16:41:03 -07:00
@@ -23,7 +23,7 @@
my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
mysql_time.h mysql/plugin.h $(BUILT_SOURCES)
-noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+noinst_HEADERS = config-win.h config-netware.h \
heap.h my_bitmap.h my_uctype.h \
myisam.h myisampack.h myisammrg.h ft_global.h\
mysys_err.h my_base.h help_start.h help_end.h \
--- 1.74/mysys/Makefile.am 2006-03-24 13:50:46 -08:00
+++ 1.75/mysys/Makefile.am 2006-04-10 16:41:03 -07:00
@@ -22,10 +22,7 @@
pkglib_LIBRARIES = libmysys.a
LDADD = libmysys.a ../dbug/libdbug.a \
../strings/libmystrings.a
-noinst_HEADERS = mysys_priv.h my_static.h \
- my_os2cond.c my_os2dirsrch.c my_os2dirsrch.h \
- my_os2dlfcn.c my_os2file64.c my_os2mutex.c \
- my_os2thread.c my_os2tls.c
+noinst_HEADERS = mysys_priv.h my_static.h
libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
mf_path.c mf_loadpath.c my_file.c \
my_open.c my_create.c my_dup.c my_seek.c my_read.c \
--- 1.124/include/my_global.h 2006-04-06 15:25:47 -07:00
+++ 1.125/include/my_global.h 2006-04-10 16:41:03 -07:00
@@ -24,13 +24,6 @@
#define HAVE_EXTERNAL_CLIENT
#endif
-#if defined( __EMX__) && !defined( MYSQL_SERVER)
-/* moved here to use below VOID macro redefinition */
-#define INCL_BASE
-#define INCL_NOPMAPI
-#include <os2.h>
-#endif /* __EMX__ */
-
#ifdef __CYGWIN__
/* We use a Unix API, so pretend it's not Windows */
#undef WIN
@@ -72,8 +65,6 @@
#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
#include <config-win.h>
-#elif defined(OS2)
-#include <config-os2.h>
#elif defined(__NETWARE__)
#include <my_config.h>
#include <config-netware.h>
| Thread |
|---|
| • bk commit into 5.1 tree (brian:1.2314) | Brian Aker | 11 Apr |
