[Pkg-mysql-commits] r1352 - in branches/sid-5.1/debian: . additions
Norbert Tretkowski
nobse at alioth.debian.org
Thu Dec 4 21:11:41 UTC 2008
tags 453820 pending
tags 461759 pending
tags 463515 pending
tags 471737 pending
tags 471887 pending
tags 474893 pending
tags 478256 pending
tags 478319 pending
tags 478553 pending
tags 478672 pending
tags 479363 pending
tags 479697 pending
tags 480292 pending
tags 480362 pending
tags 480525 pending
tags 480647 pending
tags 480924 pending
tags 480940 pending
tags 480965 pending
tags 481154 pending
tags 481303 pending
tags 481840 pending
tags 482466 pending
tags 484012 pending
tags 484704 pending
tags 485971 pending
tags 486149 pending
tags 486307 pending
tags 486443 pending
tags 486554 pending
tags 486709 pending
tags 486944 pending
tags 487270 pending
tags 488740 pending
tags 489266 pending
tags 491363 pending
tags 491688 pending
tags 492723 pending
tags 494238 pending
tags 498362 pending
tags 501413 pending
tags 507789 pending
thanks
Author: nobse
Date: 2008-12-04 21:11:41 +0000 (Thu, 04 Dec 2008)
New Revision: 1352
Added:
branches/sid-5.1/debian/mysql-client-5.1.links
Removed:
branches/sid-5.1/debian/mysql-common.README.Debian
Modified:
branches/sid-5.1/debian/additions/debian-start.inc.sh
branches/sid-5.1/debian/additions/my.cnf
branches/sid-5.1/debian/changelog
branches/sid-5.1/debian/control
branches/sid-5.1/debian/mysql-server-5.1.config
branches/sid-5.1/debian/mysql-server-5.1.mysql-server.logrotate
branches/sid-5.1/debian/mysql-server-5.1.postinst
branches/sid-5.1/debian/mysql-server-5.1.templates
branches/sid-5.1/debian/rules
Log:
Merge 5.0.51a-3 to 5.0.51a-19.
Modified: branches/sid-5.1/debian/additions/debian-start.inc.sh
===================================================================
--- branches/sid-5.1/debian/additions/debian-start.inc.sh 2008-12-04 20:40:04 UTC (rev 1351)
+++ branches/sid-5.1/debian/additions/debian-start.inc.sh 2008-12-04 21:11:41 UTC (rev 1352)
@@ -11,19 +11,19 @@
set -u
# But do it in the background to not stall the boot process.
- logger -p daemon.info -i -t$0 "Checking for crashed MySQL tables."
+ logger -p daemon.info -i -t$0 "Triggering myisam-recover for all MyISAM tables"
# Checking for $? is unreliable so the size of the output is checked.
# Some table handlers like HEAP do not support CHECK TABLE.
tempfile=`tempfile`
- LC_ALL=C $MYCHECK $MYCHECK_PARAMS \
- 2>&1 \
- | perl -e "
- \$_=join('', <>);
- s/^[^\\n]+\\n(error|note)\s+: You can't use locks with log tables.\\n//simg;
- s/^[^\\n]+\\n(error|note)\s+: The (handler|storage engine) for the table doesn.t support check\\n//smg;
- print;" \
- > $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"' | \
+ xargs -i $MYSQL --skip-column-names --silent --batch \
+ --force -e "{}" >$tempfile
if [ -s $tempfile ]; then
(
/bin/echo -e "\n" \
@@ -32,7 +32,9 @@
$MYADMIN processlist status
) >> $tempfile
# Check for presence as a dependency on mailx would require an MTA.
- if [ -x /usr/bin/mailx ]; then mailx -e -s"$MYCHECK_SUBJECT" $MYCHECK_RCPT < $tempfile; fi
+ if [ -x /usr/bin/mailx ]; then
+ mailx -e -s"$MYCHECK_SUBJECT" $MYCHECK_RCPT < $tempfile
+ fi
(echo "$MYCHECK_SUBJECT"; cat $tempfile) | logger -p daemon.warn -i -t$0
fi
rm $tempfile
Modified: branches/sid-5.1/debian/additions/my.cnf
===================================================================
--- branches/sid-5.1/debian/additions/my.cnf 2008-12-04 20:40:04 UTC (rev 1351)
+++ branches/sid-5.1/debian/additions/my.cnf 2008-12-04 21:11:41 UTC (rev 1352)
@@ -56,6 +56,9 @@
max_allowed_packet = 16M
thread_stack = 128K
thread_cache_size = 8
++# This replaces the startup script and checks MyISAM tables if needed
++# the first time they are touched
++myisam-recover = BACKUP
#max_connections = 100
#table_cache = 64
#thread_concurrency = 10
@@ -131,5 +134,6 @@
#
# * IMPORTANT: Additional settings that can override those from this file!
+# The files must end with '.cnf', otherwise they'll be ignored.
#
!includedir /etc/mysql/conf.d/
Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog 2008-12-04 20:40:04 UTC (rev 1351)
+++ branches/sid-5.1/debian/changelog 2008-12-04 21:11:41 UTC (rev 1352)
@@ -228,6 +228,218 @@
-- Christian Hammers <ch at debian.org> Sat, 29 Jul 2006 11:35:42 +0200
+mysql-dfsg-5.0 (5.0.51a-19) UNRELEASED; urgency=low
+
+ * New patch 50_fix_mysqldump2.dpatch from 5.0.60 to fix dumping databases
+ from mysql 4.0 server. (closes: #507789)
+
+ -- Norbert Tretkowski <nobse at debian.org> Thu, 04 Dec 2008 21:17:25 +0100
+
+mysql-dfsg-5.0 (5.0.51a-18) testing-proposed-updates; urgency=high
+
+ * SECURITY:
+ Fix for CVE-2008-4098: Inadequate validation of paths used in DATA
+ DIRECTORY and INDEX DIRECTORY clauses of CREATE TABLE statements enabled
+ attackers to write to tables in other databases to which they could not
+ ordinarily have access.
+
+ -- Devin Carraway <devin at debian.org> Tue, 25 Nov 2008 05:38:45 +0000
+
+mysql-dfsg-5.0 (5.0.51a-17) testing-proposed-updates; urgency=low
+
+ * Don't 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
+
+mysql-dfsg-5.0 (5.0.51a-16) unstable; urgency=low
+
+ * New patch 60_rpl_test_failure.dpatch from 5.0.54 to fix a race condition
+ with the rpl_packet test in some cases. (closes: #501413)
+
+ -- Norbert Tretkowski <nobse at debian.org> Thu, 09 Oct 2008 08:50:43 +0200
+
+mysql-dfsg-5.0 (5.0.51a-15) unstable; urgency=high
+
+ * SECURITY:
+ Fix for CVE-2008-3963: An empty bit-string literal (b'') caused a server
+ crash. Now the value is parsed as an empty bit value (which is treated as
+ an empty string in string context or 0 in numeric context).
+ (closes: #498362)
+
+ -- Norbert Tretkowski <nobse at debian.org> Sun, 14 Sep 2008 18:27:46 +0200
+
+mysql-dfsg-5.0 (5.0.51a-14) unstable; urgency=low
+
+ * Update debconf translations:
+ - Swedish, from Martin Bagge. (closes: #491688)
+ - Netherlands, from Thijs Kinkhorst. (closes: #492723)
+
+ -- Norbert Tretkowski <nobse at debian.org> Sun, 07 Sep 2008 20:18:31 +0200
+
+mysql-dfsg-5.0 (5.0.51a-13) unstable; urgency=medium
+
+ * New patch 59_fix_relay_logs_corruption.dpatch from 5.0.56 to fix
+ corruption in relay logs. (closes: #463515)
+
+ -- Norbert Tretkowski <nobse at debian.org> Wed, 03 Sep 2008 09:13:46 +0200
+
+mysql-dfsg-5.0 (5.0.51a-12) unstable; urgency=low
+
+ * Disable rpl_ndb_innodb_trans test when running the testsuite, fails
+ randomly on i386. (closes: #494238)
+
+ -- Norbert Tretkowski <nobse at debian.org> Sat, 09 Aug 2008 15:56:45 +0200
+
+mysql-dfsg-5.0 (5.0.51a-11) unstable; urgency=low
+
+ * Disable innodb_handler test when running the testsuite, fails randomly
+ on s390. (closes: #491363)
+
+ -- Norbert Tretkowski <nobse at debian.org> Wed, 23 Jul 2008 08:34:51 +0200
+
+mysql-dfsg-5.0 (5.0.51a-10) unstable; urgency=high
+
+ * Merge testing-security upload to finally fix CVE-2008-2079, thanks to
+ Devin Carraway and Steffen Joeris. (closes: #480292)
+ * New patch 58_disable-ndb-backup-print.dpatch from 5.0.54 to disable
+ ndb_backup_print, ndb_alter_table and ndb_replace tests when running the
+ testsuite. (closes: #474893)
+ * Reenable error handling in testsuite on i386, disabling it was just a
+ workaround for the problem which is now fixed with the above patch.
+ * Update debconf translations:
+ - Vietnamese, from Clytie Siddall. (closes: #486443)
+ - Spanish, from Javier Fernández-Sanguino Peña. (closes: #488740)
+ - Slovak, from helix84. (closes: #489266)
+ * Make lintian happy:
+ - Fix build-dependency on -1 revision.
+ - Fix deprecated chown usage.
+ - Fix spelling error in description.
+
+ -- Norbert Tretkowski <nobse at debian.org> Tue, 15 Jul 2008 19:37:35 +0200
+
+mysql-dfsg-5.0 (5.0.51a-9+lenny2) testing-security; urgency=high
+
+ * Non-maintainer upload by the security team.
+ * Correct error number in symlink.test to avoid FTBFS on some archs.
+
+ -- Steffen Joeris <white at debian.org> Sun, 13 Jul 2008 11:44:57 +0000
+
+mysql-dfsg-5.0 (5.0.51a-9+lenny1) testing-security; urgency=high
+
+ * Non-maintainer upload by the security team.
+ * Correct and expand 92_SECURITY_CVE-2008-2079.dpatch to cover all symlinks
+ and check the output of fn_format(). (closes: #480292)
+ Fixes: CVE-2008-2079
+
+ -- Steffen Joeris <white at debian.org> Sat, 12 Jul 2008 05:30:39 +0000
+
+mysql-dfsg-5.0 (5.0.51a-9) unstable; urgency=low
+
+ * Ignore errors in testsuite on i386. (workaround for #474893)
+
+ -- Norbert Tretkowski <nobse at debian.org> Wed, 25 Jun 2008 15:07:03 +0200
+
+mysql-dfsg-5.0 (5.0.51a-8) unstable; urgency=low
+
+ * New patch 80_fix_user_setup_on_localhost.dpatch from Daniel Hahler to fix
+ a duplicate key error when install MySQL server on a host with hostname
+ localhost. (closes: #478319)
+ * Really fix build on non-linux systems, this time without producing a build
+ error on some architectures. (closes: #485971)
+ * Update debconf translations:
+ - French, from Christian Perrier. (closes: #478553)
+ - German, from Alwin Meschede. (closes: #478672)
+ - Italian, from Luca Monducci. (closes: #479363)
+ - Czech, from Miroslav Kure. (closes: #480924)
+ - Galician, from Jacobo Tarrio. (closes: #480965)
+ - Basque, from Piarres Beobide. (closes: #481840)
+ - Swedish, from Martin Bagge. (closes: #482466, #486307)
+ - Turkish, from Mert Dirik. (closes: #484704)
+ - Russian, from Yuri Kozlov. (closes: #486149)
+ - Finnish, from Esko Arajärvi. (closes: #486554)
+ - Portuguese, from Miguel Figueiredo. (closes: #486709)
+ - Romanian, from Eddy Petrișor. (closes: #486944)
+ - Japanese, from Hideki Yamane. (closes: #487270)
+
+ -- Norbert Tretkowski <nobse at debian.org> Sat, 21 Jun 2008 19:20:48 +0200
+
+mysql-dfsg-5.0 (5.0.51a-7) unstable; urgency=high
+
+ [ Norbert Tretkowski ]
+ * SECURITY:
+ Fix for CVE-2008-2079: It was possible to circumvent privileges through
+ the creation of MyISAM tables employing the DATA DIRECTORY and INDEX
+ DIRECTORY options to overwrite existing table files in the MySQL data
+ directory. Use of the MySQL data directory in DATA DIRECTORY and INDEX
+ DIRECTORY is now disallowed. Patch from openSUSE 11.0, thanks to Michal
+ Marek. (closes: #480292)
+ * Fix build on non-linux systems, like hurd-i386. (closes: #480362)
+ * Include symlinks for mysqlcheck. (closes: #480647)
+
+ [ Monty Taylor ]
+ * Remove ndb_cpcd, as it is only for the NDB test suite and not useful as a
+ public program.
+ * Fix debian-start.inc.sh for table names with characters needing quotes.
+ Thanks Felix Rublack! (closes: #480525, #481154, #481303, #484012)
+ * Delete mysql-common.README.Debian. Nothing in it was relevant, and the
+ useful information is in mysql-server anyway. (closes: #480940)
+ * Remove a spurious HOME= in logrotate script.
+
+ -- Norbert Tretkowski <nobse at debian.org> Thu, 05 Jun 2008 11:49:45 +0200
+
+mysql-dfsg-5.0 (5.0.51a-6) unstable; urgency=low
+
+ * Fix debian-start.inc.sh to not print the row counts of the tables
+ queried. (closes: #478256, #479697)
+
+ -- Monty Taylor <mordred at inaugust.com> Wed, 14 May 2008 00:47:46 -0700
+
+mysql-dfsg-5.0 (5.0.51a-5) unstable; urgency=medium
+
+ * New patch 57_fix_mysql_replication.dpatch from 5.0.54 to fix directory for
+ relay logs when using replication.
+
+ -- Norbert Tretkowski <nobse at debian.org> Sun, 27 Apr 2008 13:55:04 +0200
+
+mysql-dfsg-5.0 (5.0.51a-4) unstable; urgency=low
+
+ [ Monty Taylor ]
+ * Remove build of ndb docs, since they are not installed. Removed build deps
+ on TeX and doxygen since that's all they were there for.
+ * Replace script in check_for_crashed_tables with a myisam-recover option
+ and a script to trigger a check of those tables. (thanks HarrisonF and
+ kolbe)
+ * Replace direct calls to test suite with calls to the make targets used by
+ the MySQL build and qa teams for releases.
+ * Add --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.
+ * Remove reference to configure options that no longer exist.
+ * Add myself to uploaders.
+
+ [ Norbert Tretkowski ]
+ * New patch 56_fix_order_by.dpatch from Ubuntu to fix ORDER BY not working
+ with GROUP BY. (closes: #471737)
+ * Add note about filename extensions in the /etc/mysql/conf.d/ directory in
+ my.cnf. (closes: #461759)
+ * Confirm password on install, patch from Nicolas Valcárcel.
+ (closes: #471887)
+ * Remove Adam Conrad from uploaders on his request. Thanks for your work in
+ the past!
+ * Use lsb_release to detect distribution.
+
+ -- Norbert Tretkowski <nobse at debian.org> Sat, 05 Apr 2008 21:51:43 +0200
+
+mysql-dfsg-5.0 (5.0.51a-3) unstable; urgency=low
+
+ * Disable patch 60_raise-max-keylength.dpatch in default build, but still
+ ship it in the source package.
+
+ -- Norbert Tretkowski <nobse at debian.org> Sun, 17 Feb 2008 18:54:42 +0100
+
mysql-dfsg-5.0 (5.0.51a-2) unstable; urgency=low
* Replace 54_ssl-client-support.dpatch added in 5.0.51-2 with patch from
Modified: branches/sid-5.1/debian/control
===================================================================
--- branches/sid-5.1/debian/control 2008-12-04 20:40:04 UTC (rev 1351)
+++ branches/sid-5.1/debian/control 2008-12-04 21:11:41 UTC (rev 1352)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
Uploaders: Christian Hammers <ch at debian.org>, Sean Finney <seanius at debian.org>, Monty Taylor <mtaylor at mysql.com>, Norbert Tretkowski <nobse at debian.org>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper (>= 4.1.16), file (>= 3.28-1), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, gs, dpatch, gawk, bison
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper (>= 4.1.16), file (>= 3.28-1), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, gs, dpatch, gawk, bison, lsb-release
Standards-Version: 3.8.0
Homepage: http://dev.mysql.com/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/
@@ -119,7 +119,7 @@
Package: mysql-server
Architecture: all
Depends: mysql-server-5.1
-Description: MySQL database server (meta package depending on the latest version)
+Description: MySQL database server (metapackage depending on the latest version)
This is an empty package that depends on the current "best" version of
mysql-server (currently mysql-server-5.1), as determined by the MySQL
maintainers. Install this package if in doubt about which MySQL
@@ -134,7 +134,7 @@
Package: mysql-client
Architecture: all
Depends: mysql-client-5.1
-Description: MySQL database client (meta package depending on the latest version)
+Description: MySQL database client (metapackage depending on the latest version)
This is an empty package that depends on the current "best" version of
mysql-client (currently mysql-client-5.1), as determined by the MySQL
maintainers. Install this package if in doubt about which MySQL version
Added: branches/sid-5.1/debian/mysql-client-5.1.links
===================================================================
--- branches/sid-5.1/debian/mysql-client-5.1.links (rev 0)
+++ branches/sid-5.1/debian/mysql-client-5.1.links 2008-12-04 21:11:41 UTC (rev 1352)
@@ -0,0 +1,3 @@
+usr/bin/mysqlcheck usr/bin/mysqlrepair
+usr/bin/mysqlcheck usr/bin/mysqlanalyze
+usr/bin/mysqlcheck usr/bin/mysqloptimize
Deleted: branches/sid-5.1/debian/mysql-common.README.Debian
===================================================================
--- branches/sid-5.1/debian/mysql-common.README.Debian 2008-12-04 20:40:04 UTC (rev 1351)
+++ branches/sid-5.1/debian/mysql-common.README.Debian 2008-12-04 21:11:41 UTC (rev 1352)
@@ -1,20 +0,0 @@
-[passwords]
-If you change the password of the root user (which is strongly recommended)
-you have to create a personal mysql config file in order to let cron run
-the /etc/cron.daily script without asking you for the password.
-The /root/.my.cnf file should be chmod 0600 (-rw------- root root .my.cnf)
-and have the following content:
-[mysqladmin]
-user = root
-password = <secret>
-
-[more than one process]
-Note that the shutdown script cannot use the pid number stored in
-/var/run, since it is for the first mysqld thread, but we need to kill
-the most recent thread to shutdown the server. The upstream developers
-are aware of this bug. When maintaining your database, you should use
-mysqladmin with your password to shutdown and reload the server rather
-than /etc/init.d/mysql.
-
-Scott Hanson and Christian Hammers
-<shanson at debian.org> <ch at debian.org>
Modified: branches/sid-5.1/debian/mysql-server-5.1.config
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.config 2008-12-04 20:40:04 UTC (rev 1351)
+++ branches/sid-5.1/debian/mysql-server-5.1.config 2008-12-04 21:11:41 UTC (rev 1352)
@@ -17,6 +17,29 @@
# there is also an additional check for empty root passwords in the
# postinst script when the tools are available for us to use.
if [ "$1" = "configure" ] && [ -z "$2" ] || [ "$1" = "reconfigure" ]; then
- db_input high mysql-server/root_password || true
- db_go
+ while :; do
+ RET=""
+ db_input medium mysql-server/root_password || true
+ db_go
+ db_get mysql-server/root_password
+ # if password isn't empty we ask for password verification
+ if [ -z "$RET" ]; then
+ db_fset mysql-server/root_password seen false
+ db_fset mysql-server/root_password_again seen false
+ break
+ fi
+ ROOT_PW="$RET"
+ db_input medium mysql-server/root_password_again || true
+ db_go
+ db_get mysql-server/root_password_again
+ if [ "$RET" == "$ROOT_PW" ]; then
+ ROOT_PW=''
+ break
+ fi
+ db_fset mysql-server/password_mismatch seen false
+ db_input critical mysql-server/password_mismatch
+ db_set mysql-server/root_password ""
+ db_set mysql-server/root_password_again ""
+ db_go
+ done
fi
Modified: branches/sid-5.1/debian/mysql-server-5.1.mysql-server.logrotate
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.mysql-server.logrotate 2008-12-04 20:40:04 UTC (rev 1351)
+++ branches/sid-5.1/debian/mysql-server-5.1.mysql-server.logrotate 2008-12-04 21:11:41 UTC (rev 1352)
@@ -13,7 +13,6 @@
test -x /usr/bin/mysqladmin || exit 0
# If this fails, check debian.conf!
- export HOME=/etc/mysql/my.cnf
MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
if [ -z "`$MYADMIN ping 2>/dev/null`" ]; then
# Really no mysqld or rather a missing debian-sys-maint user?
Modified: branches/sid-5.1/debian/mysql-server-5.1.postinst
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.postinst 2008-12-04 20:40:04 UTC (rev 1351)
+++ branches/sid-5.1/debian/mysql-server-5.1.postinst 2008-12-04 21:11:41 UTC (rev 1352)
@@ -18,7 +18,7 @@
fi
}
-MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables "
+MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --skip-ndbcluster"
test_mysql_access() {
mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1
@@ -115,7 +115,7 @@
# The mysql_datadir must not be writable by the mysql user under any
# circumstances as it contains scripts that are executed by root.
set +e
- chown -R 0.0 $mysql_datadir
+ chown -R 0:0 $mysql_datadir
chown -R mysql $mysql_statedir
chown -R mysql $mysql_rundir
chown -R mysql:adm $mysql_newlogdir; chmod 2750 $mysql_newlogdir;
@@ -164,7 +164,7 @@
# recreate the credentials file if not present or without mysql_upgrade stanza
dc=$mysql_cfgdir/debian.cnf;
if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then
- pass="`sed -n 's/password *= *// p' $dc | head -n 1`"
+ pass="`sed -n 's/^[ ]*password *= *// p' $dc | head -n 1`"
else
pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`;
if [ ! -d "$mysql_cfgdir" ]; then install -o 0 -g 0 -m 0755 -d $mysql_cfgdir; fi
Modified: branches/sid-5.1/debian/mysql-server-5.1.templates
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.templates 2008-12-04 20:40:04 UTC (rev 1351)
+++ branches/sid-5.1/debian/mysql-server-5.1.templates 2008-12-04 21:11:41 UTC (rev 1352)
@@ -70,6 +70,10 @@
.
If that field is left blank, the password will not be changed.
+Template: mysql-server/root_password_again
+Type: password
+_Description: Repeat password for the MySQL "root" user:
+
Template: mysql-server/error_setting_password
Type: error
_Description: Unable to set password for the MySQL "root" user
@@ -82,3 +86,8 @@
.
Please read the /usr/share/doc/mysql-server-5.1/README.Debian file
for more information.
+
+Template: mysql-server/password_mismatch
+Type: error
+_Description: Password input error
+ The two passwords you entered were not the same. Please try again.
Modified: branches/sid-5.1/debian/rules
===================================================================
--- branches/sid-5.1/debian/rules 2008-12-04 20:40:04 UTC (rev 1351)
+++ branches/sid-5.1/debian/rules 2008-12-04 21:11:41 UTC (rev 1352)
@@ -20,29 +20,22 @@
DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
-MAKE_J = -j$(shell grep -c processor.* /proc/cpuinfo)
+DISTRIBUTION = $(shell lsb_release -i -s)
+
+MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
ifeq (${MAKE_J}, -j0)
MAKE_J = -j1
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
+MAKE_TEST_TARGET=test-force
+ifneq ($(findstring $(DEB_BUILD_OPTIONS),fulltest),)
+# make test-bt is the testsuite run by the MySQL build team
+# before a release, but it is long
+ MAKE_TEST_TARGET=test-bt
+endif
+USE_ASSEMBLER=--enable-assembler
+
ifneq ($(findstring $(ARCH), alpha amd64 arm armel ia64 i386 hppa mipsel powerpc s390 sparc),)
TESTSUITE_FAIL_CMD=true
else
@@ -89,7 +82,7 @@
--mandir=/usr/share/man \
\
--with-server-suffix="-$(DEBVERSION)" \
- --with-comment="(Debian)" \
+ --with-comment="($(DISTRIBUTION))" \
--with-system-type="debian-linux-gnu" \
\
--enable-shared \
@@ -130,12 +123,9 @@
$(MAKE) $(MAKE_J)
-
ifeq ($(findstring $(DEB_BUILD_OPTIONS),nocheck),)
if [ ! -f testsuite-stamp ] ; then \
- cd mysql-test ; \
- /usr/bin/perl ./mysql-test-run.pl --mysqld=--user=root --force || $(TESTSUITE_FAIL_CMD) ; \
- /usr/bin/perl ./mysql-test-run.pl --mysqld=--user=root --force --ps-protocol || $(TESTSUITE_FAIL_CMD) ; \
+ $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
fi
endif
@@ -155,6 +145,7 @@
rm -f testsuite-stamp
[ ! -f Makefile ] || $(MAKE) distclean
+ [ ! -d mysql-test/var ] || rm -rf mysql-test/var
# We like to see how long this is neccessary
@echo "CRUFT BEGIN"
More information about the Pkg-mysql-commits
mailing list