[Pkg-mysql-commits] r1527 - in mysql-dfsg-5.0/branches/unstable/debian: . additions

Tue Feb 17 10:40:35 UTC 2009

tags 507049 pending
tags 510177 pending
tags 510875 pending
tags 511929 pending
tags 512651 pending
tags 513262 pending
thanks

Author: nobse
Date: 2009-02-17 10:40:34 +0000 (Tue, 17 Feb 2009)
New Revision: 1527

Modified:
   mysql-dfsg-5.0/branches/unstable/debian/additions/debian-start.inc.sh
   mysql-dfsg-5.0/branches/unstable/debian/changelog
   mysql-dfsg-5.0/branches/unstable/debian/mysql-server-5.0.config
   mysql-dfsg-5.0/branches/unstable/debian/mysql-server-5.0.postinst
Log:
Merge 5.0.51a-20 to 5.0.51a-24.

Modified: mysql-dfsg-5.0/branches/unstable/debian/additions/debian-start.inc.sh
===================================================================

--- mysql-dfsg-5.0/branches/unstable/debian/additions/debian-start.inc.sh	2009-02-17 09:18:15 UTC (rev 1526)
+++ mysql-dfsg-5.0/branches/unstable/debian/additions/debian-start.inc.sh	2009-02-17 10:40:34 UTC (rev 1527)
@@ -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: mysql-dfsg-5.0/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.0/branches/unstable/debian/changelog	2009-02-17 09:18:15 UTC (rev 1526)
+++ mysql-dfsg-5.0/branches/unstable/debian/changelog	2009-02-17 10:40:34 UTC (rev 1527)
@@ -61,11 +61,53 @@
 
  -- Norbert Tretkowski <nobse at debian.org>  Sun, 02 Nov 2008 13:51:50 +0100
 
+mysql-dfsg-5.0 (5.0.51a-24) testing-proposed-updates; urgency=low
+
+  * Update SSL certificates, and re-enable SSL related tests when running
+    the testsuite.
+
+ -- Norbert Tretkowski <nobse at debian.org>  Tue, 03 Feb 2009 15:40:47 +0100
+
+mysql-dfsg-5.0 (5.0.51a-23) testing-proposed-updates; urgency=medium
+
+  * Reset debconf password variable root_password_again immediately after
+    using it. (closes: #513262)
+  * Disable SSL related tests when running the testsuite until MySQL bug
+    #42366 gets fixed.
+
+ -- Norbert Tretkowski <nobse at debian.org>  Thu, 29 Jan 2009 14:07:32 +0100
+
+mysql-dfsg-5.0 (5.0.51a-22) testing-proposed-updates; urgency=low
+
+  * New patch 10_mysql_secure_installation.dpatch to fix failure on passwords
+    which need quoting. (closes: #511929)
+  * New patch 62_delete_with_self-join.dpatch from 5.0.54 to fix MyISAM
+    storage engine error (134) doing delete with self-join. (closes: #512651)
+
+ -- Norbert Tretkowski <nobse at debian.org>  Sun, 25 Jan 2009 10:02:35 +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
     from mysql 4.0 server. (closes: #507789)
-  * Don't create a guest account during bootstrap. (closes: #463704)
+  * Do not create a guest account during bootstrap. (closes: #463704)
 
  -- Norbert Tretkowski <nobse at debian.org>  Thu, 04 Dec 2008 23:07:19 +0100
 
@@ -81,7 +123,7 @@
 
 mysql-dfsg-5.0 (5.0.51a-17) testing-proposed-updates; urgency=low
 
-  * Don't use commented out passwords from debian.cnf. (closes: #453820)
+  * Do not use commented out passwords from debian.cnf. (closes: #453820)
   * Update watch file to recognize releases > 5.0.45.
 
  -- Norbert Tretkowski <nobse at debian.org>  Sun, 02 Nov 2008 13:31:32 +0100

Modified: mysql-dfsg-5.0/branches/unstable/debian/mysql-server-5.0.config
===================================================================
--- mysql-dfsg-5.0/branches/unstable/debian/mysql-server-5.0.config	2009-02-17 09:18:15 UTC (rev 1526)
+++ mysql-dfsg-5.0/branches/unstable/debian/mysql-server-5.0.config	2009-02-17 10:40:34 UTC (rev 1527)
@@ -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: mysql-dfsg-5.0/branches/unstable/debian/mysql-server-5.0.postinst
===================================================================
--- mysql-dfsg-5.0/branches/unstable/debian/mysql-server-5.0.postinst	2009-02-17 09:18:15 UTC (rev 1526)
+++ mysql-dfsg-5.0/branches/unstable/debian/mysql-server-5.0.postinst	2009-02-17 10:40:34 UTC (rev 1527)
@@ -28,6 +28,7 @@
 set_mysql_rootpw() {
 	# forget we ever saw the password.  don't use reset to keep the seen status
 	db_set mysql-server/root_password ""
+	db_set mysql-server/root_password_again ""
 
 	tfile=`mktemp`
 	if [ ! -f "$tfile" ]; then
@@ -255,7 +256,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"
 


