[Pkg-mysql-commits] r1362 - in branches/sid-5.1/debian: . additions

[Norbert Tretkowski]

Author: nobse
Date: 2008-12-04 22:59:41 +0000 (Thu, 04 Dec 2008)
New Revision: 1362

Removed:
   branches/sid-5.1/debian/additions/ndb_mgmd.cnf
Modified:
   branches/sid-5.1/debian/libmysqlclient-dev.files
   branches/sid-5.1/debian/mysql-server-5.1.dirs
   branches/sid-5.1/debian/rules
Log:
Dropping the rest (hopefully) of the MySQL Cluster stuff...

Deleted: branches/sid-5.1/debian/additions/ndb_mgmd.cnf
===================================================================
--- branches/sid-5.1/debian/additions/ndb_mgmd.cnf	2008-12-04 22:43:01 UTC (rev 1361)
+++ branches/sid-5.1/debian/additions/ndb_mgmd.cnf	2008-12-04 22:59:41 UTC (rev 1362)
@@ -1,35 +0,0 @@
-[NDBD DEFAULT]
-NoOfReplicas=2
-DataMemory=10MB
-IndexMemory=25MB
-MaxNoOfTables=256
-MaxNoOfOrderedIndexes=256
-MaxNoOfUniqueHashIndexes=128
-
-[MYSQLD DEFAULT]
-
-[NDB_MGMD DEFAULT]
-
-[TCP DEFAULT]
-
-[NDB_MGMD]
-Id=1                            # the NDB Management Node (this one)
-HostName=127.0.0.1          
-
-[NDBD]
-Id=2                            # the first NDB Data Node
-HostName=127.0.0.1          
-DataDir= /var/lib/mysql-cluster
-
-[NDBD]
-Id=3                            # the second NDB Data Node
-HostName=127.0.0.1          
-DataDir=/var/lib/mysql-cluster
-
-[MYSQLD]
-Id=4                            # the first SQL node
-HostName=127.0.0.1
-
-# [MYSQLD]
-# Id=5                          # the second SQL node
-# HostName=127.0.0.10

Modified: branches/sid-5.1/debian/libmysqlclient-dev.files
===================================================================
--- branches/sid-5.1/debian/libmysqlclient-dev.files	2008-12-04 22:43:01 UTC (rev 1361)
+++ branches/sid-5.1/debian/libmysqlclient-dev.files	2008-12-04 22:59:41 UTC (rev 1362)
@@ -5,4 +5,3 @@
 usr/lib/mysql/*.a
 usr/lib/mysql/*.la
 usr/share/man/man1/mysql_config.1
-usr/share/lintian/overrides/libmysqlclient-dev

Modified: branches/sid-5.1/debian/mysql-server-5.1.dirs
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.dirs	2008-12-04 22:43:01 UTC (rev 1361)
+++ branches/sid-5.1/debian/mysql-server-5.1.dirs	2008-12-04 22:59:41 UTC (rev 1362)
@@ -6,4 +6,3 @@
 usr/share/mysql
 var/run/mysqld
 var/lib/mysql-upgrade
-var/lib/mysql-cluster

Modified: branches/sid-5.1/debian/rules
===================================================================
--- branches/sid-5.1/debian/rules	2008-12-04 22:43:01 UTC (rev 1361)
+++ branches/sid-5.1/debian/rules	2008-12-04 22:59:41 UTC (rev 1362)
@@ -284,10 +284,6 @@
 	dh_installexamples -a
 	dh_installmenu -a
 	dh_installlogrotate -a --name mysql-server
-	# NDB needs to start before MySQL if they share a machine
-	# Neither should automatically restart on package install. There
-	# is a rolling order in which nodes in a cluster should be 
-	# restarted that is not possible to manage here.
 	# Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
 	# started which might depend on a running database server.
 	dh_installinit -a --name=mysql -- defaults 19 21