summaryrefslogtreecommitdiff
path: root/package/mysql/patches/patch-include_my_global_h
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-14 18:39:12 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-14 18:39:12 +0200
commit29305d896b0d54c1de34204fd27de19d95e85804 (patch)
treef77d3a53ffd7e08f4eb3b432d71efb6580d3b457 /package/mysql/patches/patch-include_my_global_h
parent75a4099667c687fc96211e12f8d8810b94c9d172 (diff)
misc stuff
- remove broken patch from silicon motion driver - add mpc package for upcoming gcc 4.5.x update - add /etc/adktarget, which can be used for native targets to identify - add ffplay subpackage
Diffstat (limited to 'package/mysql/patches/patch-include_my_global_h')
-rw-r--r--package/mysql/patches/patch-include_my_global_h10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
index 2b262bbb4..847554aae 100644
--- a/package/mysql/patches/patch-include_my_global_h
+++ b/package/mysql/patches/patch-include_my_global_h
@@ -1,5 +1,5 @@
---- mysql-5.1.41.orig/include/my_global.h Wed Nov 4 19:28:15 2009
-+++ mysql-5.1.41/include/my_global.h Tue Dec 29 13:39:20 2009
+--- mysql-5.1.48.orig/include/my_global.h 2010-06-03 17:50:27.000000000 +0200
++++ mysql-5.1.48/include/my_global.h 2010-07-12 22:51:23.369609493 +0200
@@ -18,6 +18,8 @@
#ifndef _global_h
#define _global_h
@@ -9,7 +9,7 @@
/*
InnoDB depends on some MySQL internals which other plugins should not
need. This is because of InnoDB's foreign key support, "safe" binlog
-@@ -424,7 +426,7 @@ C_MODE_END
+@@ -428,7 +430,7 @@ C_MODE_END
#ifdef HAVE_FLOAT_H
#include <float.h>
#endif
@@ -18,7 +18,7 @@
#include <fenv.h> /* For fesetround() */
#endif
-@@ -454,15 +456,20 @@ C_MODE_END
+@@ -458,15 +460,20 @@ C_MODE_END
#undef HAVE_ALLOCA
#undef HAVE_ALLOCA_H
#endif
@@ -40,7 +40,7 @@
/*
A lot of our programs uses asserts, so better to always include it
-@@ -879,9 +886,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
+@@ -883,9 +890,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
#endif /* HAVE_FINITE */
#endif /* isfinite */