[Lunar-commits] r17831 - moonbase/trunk/sql/mysql

[Jerry Lundström]

Author: prox
Date: 2005-12-28 10:01:43 +0000 (Wed, 28 Dec 2005)
New Revision: 17831

Modified:
   moonbase/trunk/sql/mysql/BUILD
   moonbase/trunk/sql/mysql/CONFIGURE
   moonbase/trunk/sql/mysql/DETAILS
   moonbase/trunk/sql/mysql/POST_INSTALL
Log:
bump to 5.0, more options, added info about asm/processor.h errors and moved install_db to post so that it doesnt get into install list and removed on lrm

Modified: moonbase/trunk/sql/mysql/BUILD
===================================================================
--- moonbase/trunk/sql/mysql/BUILD	2005-12-28 06:56:56 UTC (rev 17830)
+++ moonbase/trunk/sql/mysql/BUILD	2005-12-28 10:01:43 UTC (rev 17831)
@@ -25,17 +25,25 @@
                $OPTS                          &&
   invoke_installwatch                         &&
 
-  make  pkglibdir=/usr/lib                    &&
+  make  pkglibdir=/usr/lib                    ||
+  {
+    MYSQL_EXIT=$?
+    message ""
+    message "Compilation of mysql failed."
+    message ""
+    message "If you are getting error about 'read_cr4/write_cr4' and/or 'set_in_cr4'"
+    message "note that this is not a mysql bug."
+    message ""
+    message "To fix this please edit the include file that reports the errors and"
+    message "encapsulate the 'set_in_cr4' function with '#ifdef __KERNEL__'/'#endif'."
+    message ""
+    exit $MYSQL_EXIT;
+  }
   prepare_install                             &&
   mkdir -p /var/lib/mysql                     &&
   make  pkglibdir=/usr/lib  install           &&
   rm    -rf  /usr/mysql-test                  &&
   
-  if ! grep  -q  "\--without-server" $MODULE_CONFIG; then
-    mysql_install_db
-    chown  -R  mysql.mysql  /var/lib/mysql
-  fi                                          &&
-
   if  [ -x /etc/init.d/mysql.server ]; then
     rm -f /etc/init.d/mysql.server
     rm -f /etc/rc?.d/???mysql.server

Modified: moonbase/trunk/sql/mysql/CONFIGURE
===================================================================
--- moonbase/trunk/sql/mysql/CONFIGURE	2005-12-28 06:56:56 UTC (rev 17830)
+++ moonbase/trunk/sql/mysql/CONFIGURE	2005-12-28 10:01:43 UTC (rev 17831)
@@ -27,6 +27,17 @@
       OPTS="$OPTS --without-vio"
     fi
 
+    if query "Include the NDB Cluster table handler? " n; then
+      OPTS="$OPTS --with-ndbcluster"
+    else
+      OPTS="$OPTS --without-ndbcluster"
+    fi
+
+    if query "Support tables with more than 4 G rows even on 32 bit platforms? " n; then
+      OPTS="$OPTS --with-big-tables"
+    else
+      OPTS="$OPTS --without-big-tables"
+    fi
   fi
 
   if    query  "Include the OpenSSL support? " n; then

Modified: moonbase/trunk/sql/mysql/DETAILS
===================================================================
--- moonbase/trunk/sql/mysql/DETAILS	2005-12-28 06:56:56 UTC (rev 17830)
+++ moonbase/trunk/sql/mysql/DETAILS	2005-12-28 10:01:43 UTC (rev 17831)
@@ -1,15 +1,15 @@
           MODULE=mysql
-         VERSION=4.1.15
+         VERSION=5.0.17
           SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL[0]=http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/
-   SOURCE_URL[1]=http://mysql.mirror.nedlinux.nl/Downloads/MySQL-4.1/
-   SOURCE_URL[2]=ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-4.1/
-   SOURCE_URL[3]=ftp://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-4.1/
-      SOURCE_VFY=sha1:04e275df6c538117eac9a5ba2ab56e5f01f69286
+   SOURCE_URL[0]=http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/
+   SOURCE_URL[1]=http://mysql.mirror.nedlinux.nl/Downloads/MySQL-5.0/
+   SOURCE_URL[2]=ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-5.0/
+   SOURCE_URL[3]=ftp://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-5.0/
+      SOURCE_VFY=sha1:f5f09b00908f2c0649e320622baa16b439ebf3e9
         WEB_SITE=http://www.mysql.com
       MAINTAINER=prox at lunar-linux.org
          ENTERED=20011114
-         UPDATED=20051020
+         UPDATED=20051228
            SHORT="MySQL is a widely used and fast SQL database server."
 
 cat << EOF

Modified: moonbase/trunk/sql/mysql/POST_INSTALL
===================================================================
--- moonbase/trunk/sql/mysql/POST_INSTALL	2005-12-28 06:56:56 UTC (rev 17830)
+++ moonbase/trunk/sql/mysql/POST_INSTALL	2005-12-28 10:01:43 UTC (rev 17831)
@@ -1,3 +1,8 @@
+if ! grep  -q  "\--without-server" $MODULE_CONFIG; then
+  mysql_install_db &&
+  chown  -R  mysql.mysql  /var/lib/mysql/
+fi
+
 if mount | grep "/tmp" | grep -q tmpfs ; then
   message ""
   message "if /tmp is tmpfs and if mysql is being used against big"