|
|
@@ -1,18 +1,18 @@
|
|
|
Index: include/Makefile.in
|
|
|
---- include/Makefile.in.orig 2007-11-19 11:37:37 +0100
|
|
|
-+++ include/Makefile.in 2007-11-23 11:40:45 +0100
|
|
|
-@@ -396,14 +396,14 @@
|
|
|
+--- include/Makefile.in.orig 2008-02-13 13:08:18 +0100
|
|
|
++++ include/Makefile.in 2008-03-08 09:09:34 +0100
|
|
|
+@@ -413,14 +413,14 @@
|
|
|
decimal.h errmsg.h my_global.h my_net.h \
|
|
|
my_getopt.h sslopt-longopts.h my_dir.h \
|
|
|
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
|
|
|
- m_ctype.h my_attribute.h $(HEADERS_GEN)
|
|
|
-+ m_ctype.h my_attribute.h rijndael.h sha1.h my_aes.h $(HEADERS_GEN)
|
|
|
++ m_ctype.h my_attribute.h rijndael.h sha1.h sha2.h my_aes.h $(HEADERS_GEN)
|
|
|
|
|
|
- noinst_HEADERS = config-win.h config-netware.h \
|
|
|
+ noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.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 \
|
|
|
-- my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
|
|
|
+- my_nosys.h my_alarm.h queues.h rijndael.h sha1.h sha2.h \
|
|
|
- my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
|
|
|
+ my_nosys.h my_alarm.h queues.h \
|
|
|
+ my_tree.h my_trie.h hash.h thr_alarm.h \
|
|
|
@@ -20,9 +20,9 @@ Index: include/Makefile.in
|
|
|
mysql_version.h.in my_handler.h my_time.h \
|
|
|
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
|
|
|
Index: sql/Makefile.in
|
|
|
---- sql/Makefile.in.orig 2007-11-19 11:37:46 +0100
|
|
|
-+++ sql/Makefile.in 2007-11-23 11:41:34 +0100
|
|
|
-@@ -515,7 +515,7 @@
|
|
|
+--- sql/Makefile.in.orig 2008-02-13 13:08:25 +0100
|
|
|
++++ sql/Makefile.in 2008-03-08 09:02:38 +0100
|
|
|
+@@ -572,7 +572,7 @@
|
|
|
$(top_builddir)/strings/libmystrings.a
|
|
|
|
|
|
mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
|
|
|
@@ -30,10 +30,10 @@ Index: sql/Makefile.in
|
|
|
+LDADD = $(SUPPORTING_LIBS)
|
|
|
mysqld_LDADD = libndb.la \
|
|
|
@MYSQLD_EXTRA_LDFLAGS@ \
|
|
|
- @pstack_libs@ \
|
|
|
+ @pstack_libs@ $(libevent_libs) \
|
|
|
Index: storage/falcon/BigInt.cpp
|
|
|
---- storage/falcon/BigInt.cpp.orig 2007-11-19 11:36:36 +0100
|
|
|
-+++ storage/falcon/BigInt.cpp 2007-11-23 11:42:48 +0100
|
|
|
+--- storage/falcon/BigInt.cpp.orig 2008-02-13 13:06:54 +0100
|
|
|
++++ storage/falcon/BigInt.cpp 2008-03-08 09:02:38 +0100
|
|
|
@@ -18,11 +18,7 @@
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
@@ -47,35 +47,36 @@ Index: storage/falcon/BigInt.cpp
|
|
|
#include "Engine.h"
|
|
|
#include "BigInt.h"
|
|
|
Index: storage/falcon/Configuration.cpp
|
|
|
---- storage/falcon/Configuration.cpp.orig 2007-11-19 11:36:22 +0100
|
|
|
-+++ storage/falcon/Configuration.cpp 2007-11-23 11:51:26 +0100
|
|
|
-@@ -288,7 +288,7 @@
|
|
|
+--- storage/falcon/Configuration.cpp.orig 2008-02-13 13:06:37 +0100
|
|
|
++++ storage/falcon/Configuration.cpp 2008-03-08 09:10:32 +0100
|
|
|
+@@ -360,7 +360,7 @@
|
|
|
+ availableMemory = (uint64) availableMem;
|
|
|
+ totalMemory = (uint64) physMem;
|
|
|
|
|
|
- availableMemory *= ONE_MB;
|
|
|
- */
|
|
|
-#else
|
|
|
+#elif defined(__linux__)
|
|
|
- int32 pageSize = sysconf(_SC_PAGESIZE);
|
|
|
- //int32 physPages = sysconf(_SC_PHYS_PAGES);
|
|
|
- int32 avPhysPages = sysconf(_SC_AVPHYS_PAGES);
|
|
|
+ int64 pageSize = (int64)sysconf(_SC_PAGESIZE);
|
|
|
+ int64 physPages = (int64)sysconf(_SC_PHYS_PAGES);
|
|
|
+ int64 avPhysPages = (int64)sysconf(_SC_AVPHYS_PAGES);
|
|
|
Index: storage/falcon/MemMgr.cpp
|
|
|
---- storage/falcon/MemMgr.cpp.orig 2007-11-19 11:36:04 +0100
|
|
|
-+++ storage/falcon/MemMgr.cpp 2007-11-23 11:52:18 +0100
|
|
|
-@@ -19,11 +19,7 @@
|
|
|
- #endif
|
|
|
+--- storage/falcon/MemMgr.cpp.orig 2008-02-13 13:06:34 +0100
|
|
|
++++ storage/falcon/MemMgr.cpp 2008-03-08 09:13:09 +0100
|
|
|
+@@ -20,12 +20,7 @@
|
|
|
|
|
|
#include <stdio.h>
|
|
|
+ #include <string.h>
|
|
|
-#if defined(__APPLE__) || defined(__FreeBSD__)
|
|
|
#include <stdlib.h>
|
|
|
-#else
|
|
|
-#include <malloc.h>
|
|
|
-#endif
|
|
|
- #include <memory.h>
|
|
|
+-#include <memory.h>
|
|
|
#include "Engine.h"
|
|
|
#include "MemMgr.h"
|
|
|
+ #include "Sync.h"
|
|
|
Index: storage/falcon/Stream.cpp
|
|
|
---- storage/falcon/Stream.cpp.orig 2007-11-19 11:35:53 +0100
|
|
|
-+++ storage/falcon/Stream.cpp 2007-11-23 15:30:14 +0100
|
|
|
+--- storage/falcon/Stream.cpp.orig 2008-02-13 13:06:20 +0100
|
|
|
++++ storage/falcon/Stream.cpp 2008-03-08 09:02:38 +0100
|
|
|
@@ -19,11 +19,7 @@
|
|
|
|
|
|
#include <memory.h>
|
