[Pkg-mysql-commits] r1187 - in trunk: . debian

[Monty Taylor]

Author: mtaylor-guest
Date: 2008-03-30 02:41:15 +0000 (Sun, 30 Mar 2008)
New Revision: 1187

Modified:
   trunk/
   trunk/debian/changelog
   trunk/debian/mysql-server-5.0.postinst
Log:
* Added --skip-ndbcluster to the postinst bootstrap command. It's really a
  workaround for a bug in 5.1, but it's probably a good idea anyway since
  we certainly don't need cluster to spin up, and if people have enabled
  cluster in their my.cnf file, there could be postinst issues if cluster
  isn't running.


Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-03-01 04:51:00.186000109 -0800
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

   + timestamp: 2008-03-30 04:39:53.529000044 +0200
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

Name: bzr:revision-id:v3-trunk0
   - 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu
607 monty at inaugust.com-20080218183922-0rfctqrxnkvqirvz
608 monty at inaugust.com-20080218184224-jq7u016hfc6gvt16
609 monty at inaugust.com-20080218191319-s202z6cpd2wkk6mx
610 monty at inaugust.com-20080218193205-41o5j3pbcsjpnwhp
611 monty at inaugust.com-20080219191434-rk81tk20rs716j21
612 monty at inaugust.com-20080219191453-lt7mlbmdj6vqmv2z
613 monty at inaugust.com-20080219191808-lm6fzgy5dldmgs00
614 monty at inaugust.com-20080219195801-1qsjv2edorbp07gu
615 monty at inaugust.com-20080227185513-vudpt1mtynu6jc4v
616 monty at inaugust.com-20080227193209-cl6e3g7cmlurkc2f
620 monty at inaugust.com-20080301125100-u5yhvmmzuf7g8baz

   + 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu
607 monty at inaugust.com-20080218183922-0rfctqrxnkvqirvz
608 monty at inaugust.com-20080218184224-jq7u016hfc6gvt16
609 monty at inaugust.com-20080218191319-s202z6cpd2wkk6mx
610 monty at inaugust.com-20080218193205-41o5j3pbcsjpnwhp
611 monty at inaugust.com-20080219191434-rk81tk20rs716j21
612 monty at inaugust.com-20080219191453-lt7mlbmdj6vqmv2z
613 monty at inaugust.com-20080219191808-lm6fzgy5dldmgs00
614 monty at inaugust.com-20080219195801-1qsjv2edorbp07gu
615 monty at inaugust.com-20080227185513-vudpt1mtynu6jc4v
616 monty at inaugust.com-20080227193209-cl6e3g7cmlurkc2f
620 monty at inaugust.com-20080301125100-u5yhvmmzuf7g8baz
629 monty at inaugust.com-20080330023953-bpbgyxivz97shb09


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-28 12:20:17 UTC (rev 1186)
+++ trunk/debian/changelog	2008-03-30 02:41:15 UTC (rev 1187)
@@ -10,6 +10,11 @@
   * Replace direct calls to test suite with calls to the make targets used by
     the MySQL build and qa teams for releases.
   * Add information about Sphinx to README.Maintainer.
+  * Added --skip-ndbcluster to the postinst bootstrap command. It's really a
+    workaround for a bug in 5.1, but it's probably a good idea anyway since
+    we certainly don't need cluster to spin up, and if people have enabled
+    cluster in their my.cnf file, there could be postinst issues if cluster
+    isn't running.
 
   [ Norbert Tretkowski ]
   * New patch 56_fix_order_by.dpatch from Ubuntu to fix ORDER BY not working
@@ -20,7 +25,7 @@
     the past!
   * Use lsb_release to detect distribution.
 
- -- Norbert Tretkowski <nobse at debian.org>  Fri, 21 Mar 2008 10:15:59 +0100
+ -- Monty Taylor <mordred at inaugust.com>  Sun, 30 Mar 2008 04:39:15 +0200
 
 mysql-dfsg-5.0 (5.0.51a-3) unstable; urgency=low
 

Modified: trunk/debian/mysql-server-5.0.postinst
===================================================================
--- trunk/debian/mysql-server-5.0.postinst	2008-03-28 12:20:17 UTC (rev 1186)
+++ trunk/debian/mysql-server-5.0.postinst	2008-03-30 02:41:15 UTC (rev 1187)
@@ -18,7 +18,7 @@
   fi
 }
 
-MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables  --skip-bdb  --skip-innodb "
+MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables  --skip-bdb  --skip-innodb --skip-ndbcluster"
 
 test_mysql_access() {
 	mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1