From 499eb4d8bae79220ff461fccc05e25e15629ec88 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com/kent-amd64.(none)" <>
Date: Tue, 2 Jan 2007 11:01:48 +0100
Subject: [PATCH 1/3] view.result:   Temporary work around for bug#25359

---
 mysql-test/r/view.result | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 81711f95ae6..4d076db5c22 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -2686,12 +2686,12 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(now()) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75)
 SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75;
 Age
-42
-38
+43
+39
 SELECT * FROM v1;
 Age
-42
-38
+43
+39
 DROP VIEW v1;
 DROP TABLE t1;
 CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a char(6) DEFAULT 'xxx');

From 37ae5bbbbeb8ed892bf53cf0ff4ab1b5f671aa00 Mon Sep 17 00:00:00 2001
From: "mmj@tiger.mmj.dk" <>
Date: Thu, 4 Jan 2007 22:22:25 +0100
Subject: [PATCH 2/3] my_global.h:   Add patch from Alfredo for
 TARGET_FAT_BINARY

---
 include/my_global.h | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/include/my_global.h b/include/my_global.h
index 19ba37fd58b..2a2b4a2ba99 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -92,6 +92,42 @@
 #define NETWARE_SET_SCREEN_MODE(A)
 #endif
 
+/*
+  The macros below are used to allow build of Universal/fat binaries of
+  MySQL and MySQL applications under darwin. 
+*/
+#ifdef TARGET_FAT_BINARY
+# undef SIZEOF_CHARP 
+# undef SIZEOF_INT 
+# undef SIZEOF_LONG 
+# undef SIZEOF_LONG_LONG 
+# undef SIZEOF_OFF_T 
+# undef SIZEOF_SHORT 
+
+#if defined(__i386__)
+# undef WORDS_BIGENDIAN
+# define SIZEOF_CHARP 4
+# define SIZEOF_INT 4
+# define SIZEOF_LONG 4
+# define SIZEOF_LONG_LONG 8
+# define SIZEOF_OFF_T 8
+# define SIZEOF_SHORT 2
+
+#elif defined(__ppc__)
+# define WORDS_BIGENDIAN
+# define SIZEOF_CHARP 4
+# define SIZEOF_INT 4
+# define SIZEOF_LONG 4
+# define SIZEOF_LONG_LONG 8
+# define SIZEOF_OFF_T 8
+# define SIZEOF_SHORT 2
+
+#else
+# error Building FAT binary for an unknown architecture.
+#endif
+#endif /* TARGET_FAT_BINARY */
+
+
 /*
   The macros below are borrowed from include/linux/compiler.h in the
   Linux kernel. Use them to indicate the likelyhood of the truthfulness

From f61a873c60c2e619b402a1add2d95a75ddc95b58 Mon Sep 17 00:00:00 2001
From: "mmj@tiger.mmj.dk" <>
Date: Thu, 4 Jan 2007 23:18:04 +0100
Subject: [PATCH 3/3] my_global.h:   Patch from Alfredo for TARGET_FAT_BINARY

---
 include/my_global.h | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/include/my_global.h b/include/my_global.h
index 41b660227b5..2de54e521b5 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -84,6 +84,42 @@
 #define NETWARE_SET_SCREEN_MODE(A)
 #endif
 
+/*
+  The macros below are used to allow build of Universal/fat binaries of
+  MySQL and MySQL applications under darwin. 
+*/
+#ifdef TARGET_FAT_BINARY
+# undef SIZEOF_CHARP 
+# undef SIZEOF_INT 
+# undef SIZEOF_LONG 
+# undef SIZEOF_LONG_LONG 
+# undef SIZEOF_OFF_T 
+# undef SIZEOF_SHORT 
+
+#if defined(__i386__)
+# undef WORDS_BIGENDIAN
+# define SIZEOF_CHARP 4
+# define SIZEOF_INT 4
+# define SIZEOF_LONG 4
+# define SIZEOF_LONG_LONG 8
+# define SIZEOF_OFF_T 8
+# define SIZEOF_SHORT 2
+
+#elif defined(__ppc__)
+# define WORDS_BIGENDIAN
+# define SIZEOF_CHARP 4
+# define SIZEOF_INT 4
+# define SIZEOF_LONG 4
+# define SIZEOF_LONG_LONG 8
+# define SIZEOF_OFF_T 8
+# define SIZEOF_SHORT 2
+
+#else
+# error Building FAT binary for an unknown architecture.
+#endif
+#endif /* TARGET_FAT_BINARY */
+
+
 /*
   The macros below are borrowed from include/linux/compiler.h in the
   Linux kernel. Use them to indicate the likelyhood of the truthfulness