[Pkg-mysql-commits] r1391 - in branches/experimental-5.0/debian: . additions

[Norbert Tretkowski]

tags 507049 pending
tags 510177 pending
tags 510875 pending
thanks

Author: nobse
Date: 2009-01-09 13:24:31 +0000 (Fri, 09 Jan 2009)
New Revision: 1391

Modified:
   branches/experimental-5.0/debian/additions/debian-start.inc.sh
   branches/experimental-5.0/debian/changelog
   branches/experimental-5.0/debian/mysql-server-5.0.config
   branches/experimental-5.0/debian/mysql-server-5.0.postinst
Log:
Merge 5.0.51a-20 and 5.0.51a-21

Modified: branches/experimental-5.0/debian/additions/debian-start.inc.sh
===================================================================
--- branches/experimental-5.0/debian/additions/debian-start.inc.sh	2009-01-09 09:30:16 UTC (rev 1390)
+++ branches/experimental-5.0/debian/additions/debian-start.inc.sh	2009-01-09 13:24:31 UTC (rev 1391)
@@ -18,10 +18,10 @@
   tempfile=`tempfile`
   # We have to use xargs in this case, because a for loop barfs on the 
   # spaces in the thing to be looped over. 
-  LC_ALL=C $MYSQL --skip-column-names --batch -e  '
-      select concat("select count(*) into @discard from `",
-                    TABLE_SCHEMA, "`.`", TABLE_NAME, "`") 
-      from information_schema.TABLES where ENGINE="MyISAM"' | \
+  LC_ALL=C $MYSQL --skip-column-names --batch -e  "
+      SELECT CONCAT('SELECT COUNT(*) INTO @discard FROM \`',
+                    TABLE_SCHEMA, '\`.\`', TABLE_NAME, '\`' )
+      FROM information_schema.TABLES WHERE ENGINE='MyISAM'" | \
     xargs -i $MYSQL --skip-column-names --silent --batch \
                     --force -e "{}" >$tempfile 
   if [ -s $tempfile ]; then

Modified: branches/experimental-5.0/debian/changelog
===================================================================
--- branches/experimental-5.0/debian/changelog	2009-01-09 09:30:16 UTC (rev 1390)
+++ branches/experimental-5.0/debian/changelog	2009-01-09 13:24:31 UTC (rev 1391)
@@ -1,3 +1,9 @@
+mysql-dfsg-5.0 (5.0.75-2) UNRELEASED; urgency=low
+
+  * DUMMY
+
+ -- Norbert Tretkowski <nobse at debian.org>  Fri, 09 Jan 2009 14:24:01 +0100
+
 mysql-dfsg-5.0 (5.0.75-1) unstable; urgency=low
 
   * New upstream release.
@@ -55,6 +61,23 @@
 
  -- Norbert Tretkowski <nobse at debian.org>  Sun, 02 Nov 2008 13:51:50 +0100
 
+mysql-dfsg-5.0 (5.0.51a-21) testing-proposed-updates; urgency=low
+
+  * Ask for MySQL root password at high priority, because otherwise all
+    default installations will miss this question, thanks to Thijs Kinkhorst
+    for the patch. (closes: #510875)
+  * Do not fail checking tables when using sql-mode ansi-quotes, thanks to
+    Renato Alves for the patch. (closes: #507049)
+
+ -- Norbert Tretkowski <nobse at debian.org>  Fri, 09 Jan 2009 10:24:23 +0100
+
+mysql-dfsg-5.0 (5.0.51a-20) testing-proposed-updates; urgency=low
+
+  * New patch 60_fix_leap_seconds.dpatch from 5.0.74 to return leap second
+    values with a time part that ends with :59:59. (closes: #510177)
+
+ -- Norbert Tretkowski <nobse at debian.org>  Tue, 30 Dec 2008 10:32:46 +0100
+
 mysql-dfsg-5.0 (5.0.51a-19) testing-proposed-updates; urgency=low
 
   * New patch 50_fix_mysqldump2.dpatch from 5.0.60 to fix dumping databases

Modified: branches/experimental-5.0/debian/mysql-server-5.0.config
===================================================================
--- branches/experimental-5.0/debian/mysql-server-5.0.config	2009-01-09 09:30:16 UTC (rev 1390)
+++ branches/experimental-5.0/debian/mysql-server-5.0.config	2009-01-09 13:24:31 UTC (rev 1391)
@@ -19,7 +19,7 @@
 if [ "$1" = "configure" ] && [ -z "$2" ] || [ "$1" = "reconfigure" ]; then
   while :; do
     RET=""
-    db_input medium mysql-server/root_password || true
+    db_input high mysql-server/root_password || true
     db_go
     db_get mysql-server/root_password
     # if password isn't empty we ask for password verification
@@ -29,7 +29,7 @@
       break
     fi
     ROOT_PW="$RET"
-    db_input medium mysql-server/root_password_again || true
+    db_input high mysql-server/root_password_again || true
     db_go
     db_get mysql-server/root_password_again
     if [ "$RET" == "$ROOT_PW" ]; then

Modified: branches/experimental-5.0/debian/mysql-server-5.0.postinst
===================================================================
--- branches/experimental-5.0/debian/mysql-server-5.0.postinst	2009-01-09 09:30:16 UTC (rev 1390)
+++ branches/experimental-5.0/debian/mysql-server-5.0.postinst	2009-01-09 13:24:31 UTC (rev 1391)
@@ -255,7 +255,7 @@
 # fails for any other reason, nothing happens.
 if [ "$1" = "configure" ]; then
 	if test_mysql_access; then
-		db_input medium mysql-server/root_password || true
+		db_input high mysql-server/root_password || true
 		db_go
 		db_get mysql-server/root_password && rootpw="$RET"