[Pkg-mysql-commits] r915 - branches/sid-5.1/debian

[Christian Hammers]

Author: ch
Date: 2007-08-27 23:27:27 +0000 (Mon, 27 Aug 2007)
New Revision: 915

Modified:
   branches/sid-5.1/debian/README.Maintainer
   branches/sid-5.1/debian/changelog
   branches/sid-5.1/debian/rules
Log:
* Removed some conditionals in debian/rules. This would simplify it.
* Added comments


Modified: branches/sid-5.1/debian/README.Maintainer
===================================================================
--- branches/sid-5.1/debian/README.Maintainer	2007-08-25 19:56:38 UTC (rev 914)
+++ branches/sid-5.1/debian/README.Maintainer	2007-08-27 23:27:27 UTC (rev 915)
@@ -3,8 +3,14 @@
 ##	FIXME for 5.1    ##
 ###########################
 
+# http://dev.mysql.com/doc/refman/5.1/en/upgrading-from-5-0.html
 * Asking for root passwort has not yet been backported^H^H^H^Htested.
 * Debconf template translations need testing
+* Incompatible change: The table_cache system variable has been renamed to table_open_cache.
+  -> sed over /etc/mysql/*
+* Append --syslog to /etc/mysql/*
+* call the REPAIR TABLE statement for each table that contains any FULLTEXT  indexes.
+* put this trigger-recreation thing into the init scripts
 
 ###########################################################################
 # Here are some information that are only of interest for the current and #

Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog	2007-08-25 19:56:38 UTC (rev 914)
+++ branches/sid-5.1/debian/changelog	2007-08-27 23:27:27 UTC (rev 915)
@@ -1,8 +1,11 @@
 mysql-dfsg-5.1 (5.1.21beta-1) unstable; urgency=low
 
-  * New upstream version. 
-  * libmysqlclient.so.15 has been superseeded to libmysqlclient.so.16.
+  * My "Greetings from FrOSCon!" release.
+  * New upstream version.
+  * libmysqlclient.so.15 has been superseded by libmysqlclient.so.16.
   * Synced with 5.0 branch up to subversion release r909.
+  * Commented out most of the compile conditionals in the hope that
+    all architectures can be build the same way.
 
  -- Christian Hammers <ch at debian.org>  Sat, 25 Aug 2007 14:24:40 +0200
 

Modified: branches/sid-5.1/debian/rules
===================================================================
--- branches/sid-5.1/debian/rules	2007-08-25 19:56:38 UTC (rev 914)
+++ branches/sid-5.1/debian/rules	2007-08-27 23:27:27 UTC (rev 915)
@@ -20,22 +20,24 @@
   MAKE_J = -j1
 endif
 
-ifeq ($(findstring $(ARCH),i386 sparc),$(ARCH))
-    USE_ASSEMBLER=--enable-assembler 
-endif
+# Let's see if those special cases are still necessary.
+# 
+#   ifeq ($(findstring $(ARCH),i386 sparc),$(ARCH))
+       USE_ASSEMBLER=--enable-assembler 
+#   endif
+#
+#   ifeq ($(findstring $(ARCH), arm),$(ARCH))
+#       FOMIT_FRAME_POINTER=
+#   else
+#       FOMIT_FRAME_POINTER=-fomit-frame-pointer
+#   endif
+#   
+#   # trying to raise stability on i386. See #116631
+#   # don't use it on ia64
+#   ifeq ($(findstring $(ARCH),i386),$(ARCH))
+#     FNO_EXCEPTIONS=-fno-exceptions
+#   endif
 
-ifeq ($(findstring $(ARCH), arm),$(ARCH))
-    FOMIT_FRAME_POINTER=
-else
-    FOMIT_FRAME_POINTER=-fomit-frame-pointer
-endif
-
-# trying to raise stability on i386. See #116631
-# don't use it on ia64
-ifeq ($(findstring $(ARCH),i386),$(ARCH))
-  FNO_EXCEPTIONS=-fno-exceptions
-endif
-
 # This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf
 # so it is disabled by default although, according to MySQL, it brings >10%
 # performance gain if enabled. See #299382.
@@ -71,7 +73,7 @@
 	        --mandir=/usr/share/man \
 		\
 		--with-server-suffix="-Debian_$(DEBVERSION)" \
-		--with-comment="Debian etch distribution" \
+		--with-comment="Debian lenny distribution" \
 		\
 		--enable-shared \
 		--enable-static \
@@ -79,40 +81,28 @@
 	        $(USE_ASSEMBLER) \
 		--enable-local-infile \
 		\
+		--with-pstack \
+		--with-fast-mutexes \
                 --with-big-tables \
-		--with-raid \
 		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
 	       	--with-mysqld-user=mysql \
 		--with-libwrap \
 		$(USE_STATIC_MYSQLD) \
-		--with-vio \
 		--with-ssl \
 	    	--without-docs \
-		--with-bench \
-	        --with-libedit \
 		--with-extra-charsets=all \
-		--with-innodb \
 		\
-		--with-isam \
-		--with-archive-storage-engine \
-		--with-csv-storage-engine \
-		--with-federated-storage-engine \
-		--with-blackhole-storage-engine \
-		--without-embedded-server \
 		--with-ndbcluster \
 		--with-ndb-shm \
+		--with-ndb-docs \
 		--without-ndb-sci \
 		--without-ndb-test \
 		--with-embedded-server \
-		--with-embedded-privilege-control \
-		--with-ndb-docs'
+		--with-embedded-privilege-control'
 		
 	#       --sysconfdir=/etc/mysql  -- Appends /etc/mysql after ~/ in the my.cnf search patch!
 	#
-	#	--with-embedded-server \
-	#	--with-embedded-privilege-control \
-	#	--with-debug \
-	#	--with-mysqlfs 	 # does not build, no toplevel fs/ directory! Needs CORBA.
+	#	--with-debug
 	
 	touch configure-stamp