mysql-5.0.diff

   1 diff -uraN mysql-dfsg-5.0-5.0.51a.orig/debian/patches/00list mysql-dfsg-5.0-5.0.51a/debian/patches/00list
   2 --- mysql-dfsg-5.0-5.0.51a.orig/debian/patches/00list   2008-09-27 20:05:05.000000000 -0400
   3 +++ mysql-dfsg-5.0-5.0.51a/debian/patches/00list        2008-09-27 20:11:25.996275481 -0400
   4 @@ -16,6 +16,7 @@
   5  57_fix_mysql_replication.dpatch
   6  58_disable-ndb-backup-print.dpatch
   7  59_fix_relay_logs_corruption.dpatch
   8 +70_kopensolaris-gnu.dpatch
   9  80_fix_user_setup_on_localhost.dpatch
  10  86_PATH_MAX.dpatch
  11  89_ndb__staticlib.dpatch
  12 diff -uraN mysql-dfsg-5.0-5.0.51a.orig/debian/patches/70_kopensolaris-gnu.dpatch mysql-dfsg-5.0-5.0.51a/debian/patches/70_kopensolaris-gnu.dpatch
  13 --- mysql-dfsg-5.0-5.0.51a.orig/debian/patches/70_kopensolaris-gnu.dpatch       1969-12-31 19:00:00.000000000 -0500
  14 +++ mysql-dfsg-5.0-5.0.51a/debian/patches/70_kopensolaris-gnu.dpatch    2008-09-27 20:11:09.467053651 -0400
  15 @@ -0,0 +1,134 @@
  16 +#! /bin/sh /usr/share/dpatch/dpatch-run
  17 +## 70-kopensolaris-gnu.dpatch by  <root@maltodextrin.csclub.uwaterloo.ca>
  18 +##
  19 +## All lines beginning with `## DP:' are a description of the patch.
  20 +## DP: No description.
  21 +
  22 +@DPATCH@
  23 +diff -urNad mysql-dfsg-5.0-5.0.51a~/aclocal.m4 mysql-dfsg-5.0-5.0.51a/aclocal.m4
  24 +--- mysql-dfsg-5.0-5.0.51a~/aclocal.m4 2008-01-11 09:44:19.000000000 -0500
  25 ++++ mysql-dfsg-5.0-5.0.51a/aclocal.m4  2008-09-25 04:14:28.325178522 -0400
  26 +@@ -1397,7 +1397,7 @@
  27 +   dynamic_linker=no
  28 +   ;;
  29 +
  30 +-kfreebsd*-gnu)
  31 ++kfreebsd*-gnu | kopensolaris*-gnu)
  32 +   version_type=linux
  33 +   need_lib_prefix=no
  34 +   need_version=no
  35 +diff -urNad mysql-dfsg-5.0-5.0.51a~/configure mysql-dfsg-5.0-5.0.51a/configure
  36 +--- mysql-dfsg-5.0-5.0.51a~/configure  2008-01-11 09:46:32.000000000 -0500
  37 ++++ mysql-dfsg-5.0-5.0.51a/configure   2008-09-25 04:14:28.335064680 -0400
  38 +@@ -9570,7 +9570,7 @@
  39 +   dynamic_linker=no
  40 +   ;;
  41 +
  42 +-kfreebsd*-gnu)
  43 ++kfreebsd*-gnu | kopensolaris*-gnu)
  44 +   version_type=linux
  45 +   need_lib_prefix=no
  46 +   need_version=no
  47 +@@ -13547,7 +13547,7 @@
  48 +   dynamic_linker=no
  49 +   ;;
  50 +
  51 +-kfreebsd*-gnu)
  52 ++kfreebsd*-gnu | kopensolaris*-gnu)
  53 +   version_type=linux
  54 +   need_lib_prefix=no
  55 +   need_version=no
  56 +@@ -16155,7 +16155,7 @@
  57 +   dynamic_linker=no
  58 +   ;;
  59 +
  60 +-kfreebsd*-gnu)
  61 ++kfreebsd*-gnu | kopensolaris*-gnu)
  62 +   version_type=linux
  63 +   need_lib_prefix=no
  64 +   need_version=no
  65 +@@ -18771,7 +18771,7 @@
  66 +   dynamic_linker=no
  67 +   ;;
  68 +
  69 +-kfreebsd*-gnu)
  70 ++kfreebsd*-gnu | kopensolaris*-gnu)
  71 +   version_type=linux
  72 +   need_lib_prefix=no
  73 +   need_version=no
  74 +diff -urNad mysql-dfsg-5.0-5.0.51a~/include/my_global.h mysql-dfsg-5.0-5.0.51a/include/my_global.h
  75 +--- mysql-dfsg-5.0-5.0.51a~/include/my_global.h        2008-01-11 09:43:39.000000000 -0500
  76 ++++ mysql-dfsg-5.0-5.0.51a/include/my_global.h 2008-09-25 04:15:11.644277322 -0400
  77 +@@ -154,7 +154,8 @@
  78 +
  79 +
  80 + /* Fix problem with S_ISLNK() on Linux */
  81 +-#if defined(TARGET_OS_LINUX) || defined(__GLIBC__)
  82 ++#if defined(TARGET_OS_LINUX) || defined(__GLIBC__) || \
  83 ++      defined(__OpenSolaris_kernel__)
  84 + #undef  _GNU_SOURCE
  85 + #define _GNU_SOURCE 1
  86 + #endif
  87 +@@ -167,6 +168,11 @@
  88 + #include <sys/types.h>
  89 + #endif
  90 +
  91 ++/* Need P_PID */
  92 ++#ifdef __OpenSolaris_kernel__
  93 ++#include <sys/procset.h>
  94 ++#endif
  95 ++
  96 + /* The client defines this to avoid all thread code */
  97 + #if defined(UNDEF_THREADS_HACK)
  98 + #undef THREAD
  99 +diff -urNad mysql-dfsg-5.0-5.0.51a~/innobase/aclocal.m4 mysql-dfsg-5.0-5.0.51a/innobase/aclocal.m4
 100 +--- mysql-dfsg-5.0-5.0.51a~/innobase/aclocal.m4        2008-01-11 09:47:08.000000000 -0500
 101 ++++ mysql-dfsg-5.0-5.0.51a/innobase/aclocal.m4 2008-09-25 04:14:28.338504618 -0400
 102 +@@ -1397,7 +1397,7 @@
 103 +   dynamic_linker=no
 104 +   ;;
 105 +
 106 +-kfreebsd*-gnu)
 107 ++kfreebsd*-gnu | kopensolaris*-gnu)
 108 +   version_type=linux
 109 +   need_lib_prefix=no
 110 +   need_version=no
 111 +diff -urNad mysql-dfsg-5.0-5.0.51a~/innobase/configure mysql-dfsg-5.0-5.0.51a/innobase/configure
 112 +--- mysql-dfsg-5.0-5.0.51a~/innobase/configure 2008-01-11 09:47:30.000000000 -0500
 113 ++++ mysql-dfsg-5.0-5.0.51a/innobase/configure  2008-09-25 04:14:28.343823842 -0400
 114 +@@ -8216,7 +8216,7 @@
 115 +   dynamic_linker=no
 116 +   ;;
 117 +
 118 +-kfreebsd*-gnu)
 119 ++kfreebsd*-gnu | kopensolaris*-gnu)
 120 +   version_type=linux
 121 +   need_lib_prefix=no
 122 +   need_version=no
 123 +@@ -12193,7 +12193,7 @@
 124 +   dynamic_linker=no
 125 +   ;;
 126 +
 127 +-kfreebsd*-gnu)
 128 ++kfreebsd*-gnu | kopensolaris*-gnu)
 129 +   version_type=linux
 130 +   need_lib_prefix=no
 131 +   need_version=no
 132 +@@ -14801,7 +14801,7 @@
 133 +   dynamic_linker=no
 134 +   ;;
 135 +
 136 +-kfreebsd*-gnu)
 137 ++kfreebsd*-gnu | kopensolaris*-gnu)
 138 +   version_type=linux
 139 +   need_lib_prefix=no
 140 +   need_version=no
 141 +@@ -17417,7 +17417,7 @@
 142 +   dynamic_linker=no
 143 +   ;;
 144 +
 145 +-kfreebsd*-gnu)
 146 ++kfreebsd*-gnu | kopensolaris*-gnu)
 147 +   version_type=linux
 148 +   need_lib_prefix=no
 149 +   need_version=no