[Pkg-mysql-commits] r911 - in branches/sid-5.1/debian: . additions additions/innotop patches

Christian Hammers ch at alioth.debian.org
Sat Aug 25 17:53:50 UTC 2007


tags 290670 pending
tags 298295 pending
tags 310878 pending
tags 316127 pending
tags 318011 pending
tags 326698 pending
tags 348682 pending
tags 354544 pending
tags 354850 pending
tags 355302 pending
tags 365050 pending
tags 371841 pending
tags 377651 pending
tags 380271 pending
tags 381038 pending
tags 381043 pending
tags 382778 pending
tags 383700 pending
tags 383759 pending
tags 384047 pending
tags 384221 pending
tags 384399 pending
tags 384798 pending
tags 385119 pending
tags 385147 pending
tags 385348 pending
tags 385669 pending
tags 385874 pending
tags 385947 pending
tags 386274 pending
tags 386337 pending
tags 387369 pending
tags 387481 pending
tags 388262 pending
tags 388491 pending
tags 388941 pending
tags 389102 pending
tags 389443 pending
tags 390315 pending
tags 390692 pending
tags 390889 pending
tags 390980 pending
tags 391625 pending
tags 391741 pending
tags 392809 pending
tags 393334 pending
tags 393868 pending
tags 394262 pending
tags 394607 pending
tags 394992 pending
tags 395921 pending
tags 397597 pending
tags 398186 pending
tags 398784 pending
tags 399045 pending
tags 399074 pending
tags 399087 pending
tags 399602 pending
tags 400460 pending
tags 400809 pending
tags 401083 pending
tags 401305 pending
tags 401434 pending
tags 401953 pending
tags 403081 pending
tags 403082 pending
tags 403163 pending
tags 403721 pending
tags 403821 pending
tags 403943 pending
tags 404084 pending
tags 404318 pending
tags 404566 pending
tags 405018 pending
tags 405787 pending
tags 405793 pending
tags 406229 pending
tags 406435 pending
tags 407809 pending
tags 407859 pending
tags 408159 pending
tags 408362 pending
tags 408533 pending
tags 409750 pending
tags 409780 pending
tags 410474 pending
tags 411165 pending
tags 411328 pending
tags 411330 pending
tags 411339 pending
tags 411341 pending
tags 411345 pending
tags 411347 pending
tags 411368 pending
tags 411370 pending
tags 411377 pending
tags 411379 pending
tags 411442 pending
tags 411457 pending
tags 411480 pending
tags 411536 pending
tags 411764 pending
tags 414790 pending
tags 415026 pending
tags 416145 pending
tags 416838 pending
tags 418672 pending
tags 419974 pending
tags 420118 pending
tags 421349 pending
tags 421516 pending
tags 421751 pending
tags 421766 pending
tags 422187 pending
tags 422428 pending
tags 424276 pending
tags 424590 pending
tags 424778 pending
tags 426442 pending
tags 426545 pending
tags 426783 pending
tags 430018 pending
tags 430944 pending
tags 431018 pending
tags 431825 pending
thanks

Author: ch
Date: 2007-08-25 17:53:50 +0000 (Sat, 25 Aug 2007)
New Revision: 911

Added:
   branches/sid-5.1/debian/mysql-client-5.1.menu
   branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch
Removed:
   branches/sid-5.1/debian/additions/innotop/innotop.menu
   branches/sid-5.1/debian/patches/37_scripts__mysqld_safe.sh__syslog.dpatch
Modified:
   branches/sid-5.1/debian/README.Maintainer
   branches/sid-5.1/debian/additions/innotop/innotop.1
   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-client-5.1.files
   branches/sid-5.1/debian/mysql-client-5.1.lintian-overrides
   branches/sid-5.1/debian/mysql-server-5.1.README.Debian
   branches/sid-5.1/debian/mysql-server-5.1.config
   branches/sid-5.1/debian/mysql-server-5.1.templates
   branches/sid-5.1/debian/patches/00list
   branches/sid-5.1/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch
   branches/sid-5.1/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch
   branches/sid-5.1/debian/patches/85_ndb__staticlib.dpatch
   branches/sid-5.1/debian/rules
Log:

  * Synced with 5.0 branch up to subversion release r909.



Modified: branches/sid-5.1/debian/README.Maintainer
===================================================================
--- branches/sid-5.1/debian/README.Maintainer	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/README.Maintainer	2007-08-25 17:53:50 UTC (rev 911)
@@ -3,10 +3,13 @@
 ##	FIXME for 5.1    ##
 ###########################
 
+* The sid changelog should be included as it contains the references
+  for bug closings
 * Asking for root passwort has not yet been backported.
+* Debconf Templates and translations need to be adjusted, master copy
+  almost in sync.
 
 
-
 ###########################################################################
 # Here are some information that are only of interest for the current and #
 # following Debian maintainers of MySQL.                                  #
@@ -22,6 +25,7 @@
 tar xzf mysql-$NEW.tar.gz
 mv mysql-$NEW mysql-dfsg-5.1-$NEW.orig
 rm -rf mysql-dfsg-5.1-$NEW.orig/Docs/
+rm -rf mysql-dfsg-5.0-$NEW.orig/debian/
 tar czf mysql-dfsg-5.1_$NEW.orig.tar.gz mysql-dfsg-5.1-$NEW.orig
 rm -rf mysql-dfsg-5.1-$NEW.orig
 

Modified: branches/sid-5.1/debian/additions/innotop/innotop.1
===================================================================
--- branches/sid-5.1/debian/additions/innotop/innotop.1	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/additions/innotop/innotop.1	2007-08-25 17:53:50 UTC (rev 911)
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "INNOTOP 1p"
-.TH INNOTOP 1p "2007-03-03" "perl v5.8.8" "User Contributed Perl Documentation"
+.TH INNOTOP 1 "2007-03-03" "perl v5.8.8" "User Contributed Perl Documentation"
 .SH "NAME"
 innotop \- A MySQL and InnoDB monitor program.
 .SH "DESCRIPTION"

Deleted: branches/sid-5.1/debian/additions/innotop/innotop.menu
===================================================================
--- branches/sid-5.1/debian/additions/innotop/innotop.menu	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/additions/innotop/innotop.menu	2007-08-25 17:53:50 UTC (rev 911)
@@ -1,2 +0,0 @@
-?package(innotop):needs="text" section="Apps/Databases"\
-  title="innotop" command="/usr/bin/innotop"

Modified: branches/sid-5.1/debian/additions/my.cnf
===================================================================
--- branches/sid-5.1/debian/additions/my.cnf	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/additions/my.cnf	2007-08-25 17:53:50 UTC (rev 911)
@@ -79,6 +79,8 @@
 #log-queries-not-using-indexes
 #
 # The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
 #server-id		= 1
 log_bin			= /var/log/mysql/mysql-bin.log
 expire_logs_days	= 10

Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/changelog	2007-08-25 17:53:50 UTC (rev 911)
@@ -1,3 +1,10 @@
+mysql-dfsg-5.1 (5.1.21beta-1) unstable; urgency=low
+
+  * New upstream version. 
+  * Synced with 5.0 branch up to subversion release r909.
+
+ -- Christian Hammers <ch at debian.org>  Sat, 25 Aug 2007 14:24:40 +0200
+
 mysql-dfsg-5.1 (5.1.19beta-1) experimental; urgency=low
 
   * New upstream release.
@@ -142,6 +149,700 @@
 
  -- Christian Hammers <ch at debian.org>  Sat, 29 Jul 2006 11:35:42 +0200
 
+mysql-dfsg-5.0 (5.0.45-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * New/updated debconf translations:
+    - Spanish, from Javier Fernández-Sanguino Peña (closes: #426442).
+    - German, from Alwin Meschede (closes: #426545).
+    - Danish, from Claus Hindsgaul (closes: #426783).
+    - French, from Christian Perrier (closes: #430944).
+
+ -- sean finney <seanius at debian.org>  Thu, 19 Jul 2007 22:31:22 +0200
+
+mysql-dfsg-5.0 (5.0.45-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [sean finney]
+  * removed patches that are incorporated into the latest release:
+    - 70_cpuid_on_i486.dpatch
+    - 91_SECURITY_CVE-2007-2691_alter-drop
+  * new patch 90_upstreamdebiandir.dpatch to keep a few lingering references
+    to the upstream ./debian dir out of the build, at least until we find
+    a nice way to collaborate on sharing the directory.
+  * updated CRUFT list to fix double-build breakage (closes: #424590).
+  * add conditional build-deps for linux-libc-dev to fix FTBFS for
+    non-linux arch's (closes: #431018).
+  * added notes to my.cnf and README.Debian about setting tmpdir when
+    configuring a replication slave.  thanks to Rudy Gevaert for pointing
+    this out (closes: #431825).
+
+ -- sean finney <seanius at debian.org>  Tue, 17 Jul 2007 23:50:33 +0200
+
+mysql-dfsg-5.0 (5.0.41a-1) unstable; urgency=high
+
+  [sean finney]
+  * SECURITY:
+    Fix for CVE-2007-2691: DROP/RENAME TABLE statements (closes: #424778).
+  [Christian Hammers]
+  * Removed all manpages from the source (therefore the "41a") as they 
+    are not licensed under the GPL and redistribution is not permitted
+    (thanks to Mathias Gug). Closes: #430018
+  * Added linux-libc-dev to the build-depends as else an illegal dependency to
+    asm/atomic.h is generated in /usr/include/mysql/my_global.h. Closes: 424276
+  [Christian Perrier]
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #419974
+  * Debconf translation updates:
+    - French. Closes: #422187
+    - Galician. Closes: #420118
+    - Italian. Closes: #421349
+    - Brazilian Portuguese. Closes: #421516
+    - Arabic. Closes: #421751
+    - Czech. Closes: #421766
+    - Portuguese. Closes: #422428
+
+ -- Christian Hammers <ch at debian.org>  Sun, 24 Jun 2007 21:12:42 +0200
+
+mysql-dfsg-5.0 (5.0.41-2) unstable; urgency=low
+
+  * the previous "translation changes" inadvertently introduced unrelated
+    changes in the package control file.
+
+ -- sean finney <seanius at debian.org>  Sun, 13 May 2007 12:32:45 +0200
+
+mysql-dfsg-5.0 (5.0.41-1) unstable; urgency=low
+
+  * New upstream release
+  [sean finney]
+  * Bump the priority of the debconf prompt for the root password to high, to 
+    ensure the question shows up in a default installation (closes: #418672).
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #419974
+  * Debconf translation updates:
+    - French. Closes: #422187
+    - Galician. Closes: #420118
+    - Italian. Closes: #421349
+    - Brazilian Portuguese. Closes: #421516
+    - Arabic. Closes: #421751
+    - Czech. Closes: #421766
+    - Portuguese. Closes: #422428
+  * massaged the local PATH_MAX patch.
+  * removed temp sql parsing patch which has been incorporated upstream
+  * upstream no longer includes the mysql_create_system_tables command,
+    so removed our local patches for it.
+  * the following issues may have been fixed in a previous version of
+    mysql-server-5.0, but the exact version is not clear so they will be
+    marked as fixed in this version. 
+  * lots of NDB-related fixes, including those related to problems with
+    AUTO_INCREMENT (closes: #310878).
+  * fix for "connections remaining in sleep state" (closes: #318011).
+  * fix for "denies queries randomly" (closes: #399602).
+  * problems indexing on char() binary fields were ISAM specific, which is
+    no longer supported (closes: #326698).
+  * fix for problems with "complicated joins" (closes: 348682).
+  * fix for problems with "flushing logs, server crash" (closes: #348682).
+  * fix for AUTO_INCREMENT and duplicate keys (closes: #416145).
+  * fix for "DROP FUNCTIONS doesn't work" (closes: #290670).
+
+ -- sean finney <seanius at debian.org>  Sat, 12 May 2007 12:10:20 +0200
+
+mysql-dfsg-5.0 (5.0.38-3) unstable; urgency=low
+
+  * Added innotop. 
+  * Changed maintainer email address to
+    pkg-mysql-commits at lists.alioth.debian.org 
+
+ -- Christian Hammers <ch at debian.org>  Thu, 19 Apr 2007 19:21:15 +0200
+
+mysql-dfsg-5.0 (5.0.38-2) unstable; urgency=high
+
+  * SECURITY:
+    In some previous versions mysql_install_db was not idempotent and did
+    always create passwordless root accounts although it should only on
+    initial installs (thanks to Olaf van der Spek). Closes: #418672
+  * Added check for passwordless root accounts to debian-start.
+  * As MySQL-5.0 is, at least currently, incompatible with Kernel 2.4 the
+    installation is aborted for such old kernels. Debian Etch does not support
+    them anyway according to the release notes but this might be unexpected
+    and many production servers still have self build ones installed (thanks
+    to Marc-Christian Petersen). See: #416841
+  * Adjusted TeX build-deps to texlive.
+
+ -- Christian Hammers <ch at debian.org>  Tue, 17 Apr 2007 01:00:41 +0200
+
+mysql-dfsg-5.0 (5.0.38-1) unstable; urgency=low
+
+  * New upstream release.
+  * Activated the blackhole engine as it's needed for replicating partition
+    designs (thanks to Cyril SCETBON). 
+  * Fixed segfault on i486 systems without cpuid instruction (thanks to
+    Lennart Sorensen). Closes: #410474
+  * Only use of the non-essential debconf package in postrm if it is still
+    installed (thanks to Michael Ablassmeier). Closes: #416838
+
+ -- Christian Hammers <ch at debian.org>  Thu,  5 Apr 2007 22:43:41 +0200
+
+mysql-dfsg-5.0 (5.0.36-1) unstable; urgency=low
+
+  * New upstream release.
+    Closes: #400460, #408159, #408533
+
+ -- Christian Hammers <ch at debian.org>  Thu, 22 Mar 2007 22:16:31 +0100
+
+mysql-dfsg-5.0 (5.0.32-10) unstable; urgency=high
+
+  * Really fixed FTBFS on Sparc introduced with the "make -j" trick in 
+    5.0.32-8 (thanks to Frank Lichtenheld). Closes: #415026
+
+ -- Christian Hammers <ch at debian.org>  Sun, 18 Mar 2007 20:52:33 +0100
+
+mysql-dfsg-5.0 (5.0.32-9) unstable; urgency=high
+
+  * Fixed FTBFS on Sparc introduced with the "make -j" trick in 5.0.32-8
+    (thanks to Frank Lichtenheld). Closes: #415026
+
+ -- Christian Hammers <ch at debian.org>  Tue, 15 Mar 2007 18:55:42 +0100
+
+mysql-dfsg-5.0 (5.0.32-8) unstable; urgency=high
+
+  [Sean Finney]
+  * SECURITY:
+    - CVE-2007-1420: Single Row Subselect DoS.  Specially crafted subselect
+      queries could crash the mysql server.  Patch backported from upstream
+      changeset 19685 (46_CVE-2007-1420_subselect_dos.dpatch) 
+      closes: #414790.
+  [Christian Hammers]
+  * Adapt MAKE_J to use the -j option with the number of available processors.
+    (thanks to Raphael Pinson).
+  * Updated mysqlreport to latest upstream (and patched --help usage message
+    and "return if qcache_size==0").
+
+ -- sean finney <seanius at debian.org>  Wed, 14 Mar 2007 20:19:08 +0100
+
+mysql-dfsg-5.0 (5.0.32-7) unstable; urgency=low
+
+  * Updated French Debconf translation (thanks to Christian Perrier).
+    Closes: #411330
+  * Updated Danish Debconf translation (thanks to Claus Hindsgaul).
+    Closes: #411328
+  * Updated Portuguese Debconf translation (thanks to "Traduz").
+    Closes: #411339
+  * Updated Czech Debconf translation (thanks to Miroslav Kure).
+    Closes: #411341
+  * Added Norwegian Debconf translation (thanks to Bjorn Steensrud).
+    Closes: #411345
+  * Updated Spanish Debconf translation (thanks to Javier Fernandez-Sanguino
+    Pena). Closes: #411347
+  * Updated Japanese Debconf translation (thanks to Hideki Yamane).
+    Closes: #411368
+  * Updated Swedish Debconf translation (thanks to Andreas Henriksson).
+    Closes: #411370
+  * Updated Italian Debconf translation (thanks to Luca Monducci).
+    Closes: #411377
+  * Updated Galician Debconf translation (thanks to Jacobo Tarrio).
+    Closes: #411379
+  * Updated Russian Debconf translation (thanks to Yuriy Talakan).
+    Closes: #411442
+  * Updated Basque Debconf translation (thanks to Piarres Beobide).
+    Closes: #411457
+  * Updated German Debconf translation (thanks to Alwin Meschede).
+    Closes: #411480
+  * Updated Dutch Debconf translation (thanks to Thijs Kinkhorst).
+  * Updated Brazilian Portuguese translation (thanks to Andre Luis Lopes).
+    Closes: #411536
+  * Updated Romanian Debconf translation (thanks to Stan Ioan-Eugen). 
+    Closes: #411764
+
+ -- Christian Hammers <ch at debian.org>  Fri, 16 Feb 2007 23:20:42 +0100
+
+mysql-dfsg-5.0 (5.0.32-6) unstable; urgency=low
+
+  * Changed wording in Debconf templates to better fit to the graphical
+    interface (thanks to Frank Kuester). Closes: #411165
+  * Lintian suggested style changes to some other Debconf questions.
+  * Removed accidently stdout output from init script.
+
+ -- Christian Hammers <ch at debian.org>  Fri, 16 Feb 2007 20:29:18 +0100
+
+mysql-dfsg-5.0 (5.0.32-5) unstable; urgency=medium
+
+  * Backported upstream patch for a bug that crashed the server when using
+    certain join/group/limit combinations. 
+    Users of the Joomla CMS seemed to be affected by this. Closes: #403721
+  * The debian-start script that runs on every server start now first upgrades
+    the system tables (if neccessary) and then check them as it sometimes did
+    not work the other way around (e.g. for MediaWiki). The script now uses 
+    mysql_update instead of mysql_update_script as recommended. Closes: 409780
+  * Remove the Debconf generated config file in postrm.
+
+ -- Christian Hammers <ch at debian.org>  Thu, 15 Feb 2007 04:47:04 +0100
+
+mysql-dfsg-5.0 (5.0.32-4) unstable; urgency=high
+
+  [Christian Hammers]
+  * Changed minimum required version in dh_makeshlibs to 5.0.27-1 as
+    5.0.26 had an ABI breakage in it!
+    This is the cause for Perl programs crashing with the following error: 
+    "Transactions not supported by database at /usr/lib/perl5/DBI.pm line 672"
+  * The old_passwords setting that is set according to a Debconf question is
+    now written to /etc/mysql/conf.d/old_passwords.cnf instead directly to the
+    conffile /etc/mysql/my.cnf which would be fobidden by policy (thanks to
+    Robert Bihlmeyer). Closes: #409750
+  * Added some more comments to the default my.cnf.
+  [Monty Taylor]
+  * Added bison to build dependencies.
+  * Added a "start-initial" option to the Data Node init script to support
+    initial node starts.
+  * Changed NDB Data and Management node startup seqence. Prevented both from
+    restarting on upgrade to address rolling upgrade issues.
+  * Updated build-depends to depend on automake1.9 instead of automake1.8
+    to match what upstream uses. 
+
+ -- Christian Hammers <ch at debian.org>  Wed, 31 Jan 2007 01:14:09 +0100
+
+mysql-dfsg-5.0 (5.0.32-3) unstable; urgency=high
+
+  * mysql-server-5.0 pre-depends on adduser now and has --disabled-login
+    explicitly added to be on the safe side (thanks to the puiparts team).
+    Closes: #408362
+  * Corrections the terminology regarding NDB in the comments of all config
+    files and init scripts (thanks to Geert Vanderkelen of MySQL).
+  * Updated Swedish Debconf translation (thanks to Andreas Henriksson).
+    Closes: #407859
+  * Updated Czech Debconf translation (thanks to Miroslav Kure).
+    Closes: #407809
+
+ -- Christian Hammers <ch at debian.org>  Thu, 11 Jan 2007 11:18:47 +0100
+
+mysql-dfsg-5.0 (5.0.32-2) unstable; urgency=high
+
+  * The last upload suffered from a regression that made NDB totally
+    unusable and caused a dependency to libmysqlclient15-dev in the
+    mysql-server-5.0 package. The relevant 85_* patch was re-added again.
+    Closes: #406435
+  * Added lintian-overrides for an error that does not affect our packages.
+    There are now only warnings and not errors left.
+
+ -- Christian Hammers <ch at debian.org>  Tue,  9 Jan 2007 23:55:10 +0100
+
+mysql-dfsg-5.0 (5.0.32-1) unstable; urgency=high
+
+  * New upstream version.
+    * SECURITY: mysql_fix_privilege_tables.sql altered the 
+      table_privs.table_priv column to contain too few privileges, causing
+      loss of the CREATE VIEW and SHOW VIEW privileges. (MySQL Bug#20589)
+    * SECURITY (DoS): ALTER TABLE statements that performed both RENAME TO
+      and {ENABLE|DISABLE} KEYS operations caused a server crash. (MySQL
+      Bug#24089)
+    * SECURITY (DoS): LAST_DAY('0000-00-00') could cause a server crash.
+      (MySQL Bug#23653)
+    * SECURITY (DoS): Using EXPLAIN caused a server crash for queries that 
+      selected from INFORMATION_SCHEMA in a subquery in the FROM clause.
+      (MySQL Bug#22413)
+    * SECURITY (DoS): Invalidating the query cache (e.g. when using stored procedures) 
+      caused a server crash for INSERT INTO ... SELECT statements that 
+      selected from a view. (MySQL Bug#20045)
+    * Using mysql_upgrade with a password crashed the server. Closes: #406229
+    * yaSSL crashed on pre-Pentium Intel and Cyrix CPUs. (MySQL Bug#21765)
+      Closes: #383759
+    * Lots of small fixes to the NDB cluster storage engine.
+  * Updated Japanese Debconf template (thanks to Hideki Yamane).
+    Closes: #405793
+  * Fixed comment regarding "mycheck" in debian-start (thanks to
+    Enrico Zini). Closes: #405787
+
+ -- Christian Hammers <ch at debian.org>  Sat,  6 Jan 2007 14:26:20 +0100
+
+mysql-dfsg-5.0 (5.0.30-3) unstable; urgency=low
+
+  * Updated Brazilian Debconf translation (thanks to Andre Luis Lopes).
+    Closes: #403821
+  * Added Romanian Debconf translation (thanks to Stan Ioan-Eugen).
+    Closes: #403943
+  * Updated Spanish Debconf translation (thanks to Javier Fernandez-Sanguino
+    Pena). Closes: #404084
+  * Updated Galician Debconf translation (thanks to Jacobo Tarrio).
+    Closes: #404318
+  * Updated Dutch Debconf translation (thanks to Vincent Zweije).
+    Closes: #404566
+  * Updated Danish Debconf translation (thanks to Claus Hindsgaul).
+    Closes: #405018
+
+ -- Christian Hammers <ch at debian.org>  Thu, 21 Dec 2006 21:35:09 +0100
+
+mysql-dfsg-5.0 (5.0.30-2) unstable; urgency=high
+
+  * Fixed upstream regression in header files that lead to FTBFS for
+    mysql-admin, mysql-query-browser and probably other pacakges.
+    (thanks to Andreas Henriksson). Closes: #403081, #403082
+  * Fixed some upstream scripts by replacing /etc by /etc/mysql (thanks to
+    Julien Antony). Closes: #401083
+  * Updated French Debconf translation (thanks to Christian Perrier).
+    Closes: #401434
+  * Added Spanish Debconf translation (thanks to Javier Fernandez-Sanguino
+    Pena). Closes: #401953
+  * Marked a Debconf question that is just a dummy and only internally
+    used as not-needing-translation. Closes: #403163
+  * Fixed mysqlslowdump patch to not remove the usage() function (thanks 
+    to Monty Tailor).
+
+ -- Christian Hammers <ch at debian.org>  Sun,  3 Dec 2006 19:20:10 +0100
+
+mysql-dfsg-5.0 (5.0.30-1) unstable; urgency=low
+
+  * New upstream version (switch to the MySQL Enterprise branch).
+  * Upstream bugfix for the Innodb performance bug:
+    "Very poor performance with multiple queries running
+     concurrently (Bug#15815)".
+  * Upstream bugfix for a possible server crash:
+    "Selecting from a MERGE table could result in a server crash if the
+     underlying tables had fewer indexes than the MERGE table itself
+     (Bug#22937)"
+  * Upstream bugfies for *lot* of NDB problems.
+  * Upstream bugfix for Innodb optimizer bug. Closes: #397597
+  * Updated Italian Debconf translation (thanks to Luca Monducci).
+    Closes: #401305 
+  * Updated debian/watch file to MySQL Enterprise branch.
+
+ -- Christian Hammers <ch at debian.org>  Sat,  2 Dec 2006 16:36:38 +0100
+
+mysql-dfsg-5.0 (5.0.27-2) unstable; urgency=medium
+
+  * Disabled YaSSL x86 assembler as it was reported to crash applications
+    like pam-mysql or proftpd-mysql which are linked against libmysqlclient
+    on i486 and Cyrix (i586) CPUs. Closes: #385147
+  * Adjusted mysql-server-4.1 priority to extra and section to oldlibs
+    according to the ftp masters overrides.
+  * Updated German Debconf translation (thanks to Alwin Meschede).
+    Closes: #400809
+
+ -- Christian Hammers <ch at debian.org>  Wed, 22 Nov 2006 13:36:31 +0100
+
+mysql-dfsg-5.0 (5.0.27-1) unstable; urgency=medium
+
+  * New upstream version (but no codechange, the only difference to 5.0.26
+    was a patch to the ABI change which Debian already included.
+  * When dist-upgrading from mysql-server-4.1/sarge dpkg does not longer
+    ask unnecessary "config file has changed" questions regarding
+    /etc/init.d/mysql, /etc/logrotate.d/mysql-server and
+    /etc/mysql/debian-start just because these files previously belonged
+    to mysql-server-4.1 and not to mysql-server-5.0.
+    To archive this mysql-server-5.0 now pre-depends on mysql-common which
+    provides current versions of those files.
+  * The automatic run mysql_upgrade now works with non-standard datadir
+    settings, too (thanks to Benjami Villoslada). Closes: #394607
+  * Debconf now asks if the old_passwords option is really needed.
+  * Improved explanations of the old_passwords variable in my.cnf.
+  * Removed possibly leftover cron script from MySQL-4.1 (thanks to
+    Mario Oyorzabal Salgado). Closes: #390889
+  * Postrm ignores failed "userdel mysql".
+  * Updated Danish Debconf translation (thanks to Claus Hindsgaul).
+    Closes: #398784
+  * Added Euskarian Debconf translation (thanks to Piarres Beobide).
+    Closes: #399045
+  * Updated Japanese Debconf translation (thanks to Hideki Yamane).
+    Closes: #399074
+  * Updated German Debconf translation (thanks to Alwin Meschede).
+    Closes: #399087
+  * New Portuguese debconf translations from Miguel Figueiredo. 
+    Closes: #398186
+
+ -- Christian Hammers <ch at debian.org>  Tue,  7 Nov 2006 21:26:25 +0100
+
+mysql-dfsg-5.0 (5.0.26-3) unstable; urgency=high
+
+  [sean finney]
+  * Fix for the deadly ISAM trap.  Now during upgrades we will do our
+    very best to convert pre-existing ISAM format tables using the
+    binaries from the previous package.  Success is not guaranteed, but
+    this is probably as good as it gets.  Note that this also necessitates
+    re-introducing an (empty transitional) mysql-server-4.1 package.
+    Closes: #354544, #354850
+  * Remove a couple spurious and wrongly placed WARNING statements from
+    45_warn-CLI-passwords.dpatch.  thanks to Dan Jacobsen for pointing these
+    out.  Closes: #394262
+
+ -- sean finney <seanius at debian.org>  Fri, 03 Nov 2006 18:34:46 +0100
+
+mysql-dfsg-5.0 (5.0.26-2) unstable; urgency=high
+
+  * Fixed FTBFS for Alpha by applying an upstream patch (thanks to Falk
+    Hueffner). Closes: #395921
+
+ -- Christian Hammers <ch at debian.org>  Sat, 28 Oct 2006 20:13:46 +0200
+
+mysql-dfsg-5.0 (5.0.26-1) unstable; urgency=high
+
+  * SECURITY: 
+    This combined release of 5.0.25 and 5.0.26 fixes lot of possible server
+    crashs so it should get into Etch. Quoting the changelog (bug numbers are
+    bugs.mysql.com ones):
+    - character_set_results can be NULL to signify no conversion, but some
+      code did not check for NULL, resulting in a server crash. (Bug#21913)
+    - Using cursors with READ COMMITTED isolation level could cause InnoDB to
+      crash. (Bug#19834)
+    - Some prepared statements caused a server crash when executed a second
+      time. (Bug#21166)
+    - When DROP DATABASE or SHOW OPEN TABLES was issued while concurrently 
+      issuing DROP TABLE (or RENAME TABLE, CREATE TABLE LIKE or any other 
+      statement that required a name lock) in another connection, the server 
+      crashed. (Bug#21216)
+    - Use of zero-length variable names caused a server crash. (Bug#20908)
+    - For InnoDB tables, the server could crash when executing NOT IN () 
+      subqueries. (Bug#21077) 
+    - Repeated DROP TABLE statements in a stored procedure could sometimes
+      cause the server to crash. (Bug#19399)
+    - Performing an INSERT on a view that was defined using a SELECT that 
+      specified a collation and a column alias caused the server to crash 
+      (Bug#21086).
+    - A query of the form shown here caused the server to crash. (Bug#21007)
+    - NDB Cluster: Some queries involving joins on very large NDB tables could
+      crash the MySQL server. (Bug#21059)
+    - The character set was not being properly initialized for CAST() with a
+      type like CHAR(2) BINARY, which resulted in incorrect results or even a 
+      server crash. (Bug#17903)
+    - For certain queries, the server incorrectly resolved a reference to an
+      aggregate function and crashed. (Bug#20868)
+    - The server crashed when using the range access method to execut a
+      subquery with a ORDER BY DESC  clause. (Bug#20869)
+    - Triggers on tables in the mysql database caused a server crash. Triggers
+      for tables in this database now are disallowed. (Bug#18361)
+    - Using SELECT on a corrupt MyISAM table using the dynamic record format 
+      could cause a server crash. (Bug#19835) 
+    - Use of MIN() or MAX()  with GROUP BY on a ucs2  column could cause a
+      server crash. (Bug#20076)
+    - Selecting from a MERGE table could result in a server crash if the
+      underlying tables had fewer indexes than the MERGE table itself. 
+      (Bug#21617, Bug#22937)
+
+  * New upstream release.
+    - This bug would cause trouble for Sarge->Etch upgrades, it was supposed to
+      have been fixed in 5.0.16 but that apparently did not fix the whole
+      problem:
+      Using tables from MySQL 4.x in MySQL 5.x, in particular those with VARCHAR
+      fields and using INSERT DELAYED to update data in the table would result in
+      either data corruption or a server crash. (Bug#16611, Bug#16218, Bug#17294) 
+      Closes: #386337
+    - Fixes data corruption as an automatic client reconnect used to set
+      the wrong character set. Closes: #365050
+    - Fixes an undefined ulong type in an include file. Closes: #389102
+    - Fixes wrong output format when using Unicode characters. Closes: #355302
+    - Fixes mysql_upgrade when using a password. Closes: #371841
+ 
+  [Christian Hammers]
+  * Removed --sysconfdir from debian/rules as it puts /etc/mysql/ at the
+    end of the my.cnf search patch thus overriding $HOME/my.cnf
+    (thanks to Christoph Biedl). Closes: #394992
+  * The provided patch from bug #385947 was wrong, the variable is called
+    BLOCKSIZE not BLOCK_SIZE according to "strings `which df`" (thanks to
+    Bruno Muller). Closes: #385947
+
+  [sean finney]
+  * new dutch debconf translations from Vincent Zweije (closes: #392809).
+  * new japanese debconf translations from Hideki Yamane (closes: #391625).
+  * new italian debconf translations from Luca Monducci (closes: #391741).
+  * new french debconf translations from Christian Perrier (closes: #393334).
+  * ran debconf-updatepo to merge the fuzzies into svn.
+  * massage the following patches so they continue to apply cleanly:
+    - 44_scripts__mysql_config__libs.dpatch to cleanly apply.
+    - 45_warn-CLI-passwords.dpatch
+    - 96_TEMP__libmysqlclient_ssl_symbols.dpatch (note, this patch might
+      no longer be needed, but is retained "just in case" after massaging it)
+  * the following patches have been incorporated upstream:
+    - 70_kfreebsd.dpatch
+    - 80_hurd_mach.dpatch
+    - 87_ps_Hurd.dpatch
+    - 90_TEMP__client__mysql_upgrade__O_EXEC.dpatch
+    - 91_TEMP__client__mysql_upgrade__password.dpatch
+    - 92_TEMP__client__mysql_upgrade__defaultgroups.dpatch
+    - 94_TEMP__CVE-2006-4227.dpatch
+    - 95_TEMP__CVE-2006-4226.dpatch
+  * the udf_example.cc has disappeared from the source code, but there's
+    a udf_example.c which seems to be a good example to use instead :)
+  * update documentation in the configuration to no longer reference
+    using my.cnf in the DATADIR, as it's never been the recommended
+    method for debian systems and hasn't worked since 5.0 was released
+    anyway (closes: #393868).
+
+ -- Christian Hammers <ch at debian.org>  Wed, 25 Oct 2006 19:54:04 +0200
+
+mysql-dfsg-5.0 (5.0.24a-9) unstable; urgency=medium
+
+  * Having expire_logs_days enabled but log-bin not crashes the server. Using
+    both or none of those options is safe. To prevent this happening during the 
+    nightly log rotation via /etc/logrotate.d/mysql the initscript checks for 
+    malicious combination of options. See: #368547
+  * The Sarge package "mysql-server" which used to include the mysqld daemon
+    may still be in unselected-configured state (i.e. after a remove but not
+    purge) in which case its now obsolete cronscript has to be moved away
+    (thanks to Charles Lepple). Closes: #385669
+  * Updated Danish Debconf translation (thanks to Claus Hindsgaul).
+    Closes: #390315
+  * Updated Frensh Debconf translation (thanks to Christian Perrier).
+    Closes: #390980
+
+ -- Christian Hammers <ch at debian.org>  Tue,  3 Oct 2006 14:55:31 +0200
+
+mysql-dfsg-5.0 (5.0.24a-8) unstable; urgency=low
+
+  * (broken upload)
+
+ -- Christian Hammers <ch at debian.org>  Tue,  3 Oct 2006 14:55:31 +0200
+
+mysql-dfsg-5.0 (5.0.24a-7) unstable; urgency=low
+
+  * Stopped mysql_config from announcing unnecessary library dependencies
+    which until now cause "NEEDED" dependencies in the "readelf -d" output
+    of libraries who only depend on libmysqlclient.so (thanks to Michal
+    Cihar). Closes: #390692
+
+ -- Christian Hammers <ch at debian.org>  Sun,  1 Oct 2006 23:59:43 +0200
+
+mysql-dfsg-5.0 (5.0.24a-6) unstable; urgency=low
+
+  [sean finney]
+  * finally add support for setting a root password at install.
+    while this is not a random password as requested in one bug
+    report, we believe it is the best solution and provides a
+    means to set a random password via preseeding if it's really
+    desired (Closes: #316127, #298295).
+
+ -- sean finney <seanius at debian.org>  Sun, 01 Oct 2006 23:34:30 +0200
+
+mysql-dfsg-5.0 (5.0.24a-5) unstable; urgency=low
+
+  * Added ${shlibs:Depends} to debian/control section libmysqlclient-dev as it
+    contains the experimental /usr/lib/mysql/libndbclient.so.0.0.0.
+  * Bumped standards version to 3.7.2.
+  * Added LSB info section to init scripts.
+  * Rephrased Debconf templates as suggested by lintian.
+  * Added benchmark suite in /usr/share/mysql/sql-bench/.
+  * The mysql.timezone* tables are now filled by the postinst script (thanks
+    to Mark Sheppard). Closes: #388491
+  * Moved Debconf install notes to README.Debian. Displaying them with
+    medium priority was a bug anyway. Closes: #388941
+  * Replaced /usr/bin/mysql_upgrade by /usr/bin/mysql_upgrade_shell in
+    /etc/mysql/debian-start.sh as it works without errors (thanks to Javier
+    Kohen). Closes: #389443
+
+ -- Christian Hammers <ch at debian.org>  Wed, 20 Sep 2006 15:01:42 +0200
+
+mysql-dfsg-5.0 (5.0.24a-4) unstable; urgency=high
+
+  * libmysqlclient.so.15 from 5.0.24 accidentaly exports some symbols that are
+    historically exported by OpenSSL's libcrypto.so. This bug was supposed to
+    be fixed in 5.0.24a bug according to the mysql bug tracking system will
+    only be fixed in 5.0.25 so I backported the patch. People already reported
+    crashing apps due to this (thanks to Duncan Simpson). See also: #385348
+    Closes: #388262
+  * Fixed BLOCKSIZE to BLOCK_SIZE in initscript (thanks to Bruno Muller).
+    Closes: #385947
+  * Added hint to "--extended-insert=0" to mysqldump manpage (thanks to Martin
+    Schulze).
+  * Documented the meaning of "NDB" in README.Debian (thanks to Dan Jacobson).
+    Closes: #386274
+  * Added patch to build on hurd-i386 (thanks to Cyril Brulebois). Closes: #387369
+  * Fixed debian-start script to work together with the recend LSB modifications in
+    the initscript (thanks to wens). Closes: #387481
+  * Reverted tmpdir change in my.cnf back to /tmp to comply with FHS (thanks
+    to Alessandro Valente). Closes: #382778
+  * Added logcheck filter rule (thanks to Paul Wise). Closes: #381043
+  * I will definetly not disable InnoDB but added a note to the default my.cnf
+    that disabling it saves about 100MB virtual memory (thanks to Olivier
+    Berger). Closes: #384399
+  * Added thread_cache_size=8 to default my.cnf as this variable seems to have
+    a negligible memory footprint but can improve performance when lots of
+    threads connect simultaneously as often seen on web servers.
+
+ -- Christian Hammers <ch at debian.org>  Mon,  4 Sep 2006 00:21:50 +0200
+
+mysql-dfsg-5.0 (5.0.24a-3) unstable; urgency=low
+
+  * Fixed potential tempfile problem in the newly added mysqlreport script.
+
+ -- Christian Hammers <ch at debian.org>  Sun,  3 Sep 2006 23:17:24 +0200
+
+mysql-dfsg-5.0 (5.0.24a-2) unstable; urgency=low
+
+  * Added "mysqlreport" (GPL'ed) from hackmysql.com.
+  * Temporarily disabled expire_days option as it causes the server
+    to crash. See #368547
+  * Made output of init scripts LSB compliant (thanks to David Haerdeman).
+    Closes: #385874
+
+ -- Christian Hammers <ch at debian.org>  Sun,  3 Sep 2006 19:06:53 +0200
+
+mysql-dfsg-5.0 (5.0.24a-1) unstable; urgency=high
+
+  * New upstream version.
+  * The shared library in the 5.0.24 upstream release accidently exported 
+    some symbols that are also exported by the OpenSSL libraries (notably
+    BN_bin2bn) causing unexpected behaviour in applications using these 
+    functions (thanks to Peter Cernak). Closes: #385348
+  * Added note about possible crash on certain i486 clone CPUs.
+  * Made recipient address of startup mysqlcheck output configurable
+    (thanks to Mattias Guns). Closes: #385119
+
+ -- Christian Hammers <ch at debian.org>  Mon, 28 Aug 2006 01:22:12 +0200
+
+mysql-dfsg-5.0 (5.0.24-3) unstable; urgency=high
+
+  * SECURITY:
+    CVE-2006-4226:
+    When run on case-sensitive filesystems, MySQL allows remote
+    authenticated users to create or access a database when the database 
+    name differs only in case from a database for which they have
+    permissions.
+    CVE-2006-4227:
+    MySQL evaluates arguments of suid routines in the security context of
+    the routine's definer instead of the routine's caller, which allows
+    remote authenticated users to gain privileges through a routine that 
+    has been made available using GRANT EXECUTE.
+    Thanks to Stefan Fritsch for reporting. Closes: #384798
+
+ -- Christian Hammers <ch at debian.org>  Sat, 26 Aug 2006 04:55:17 +0200
+
+mysql-dfsg-5.0 (5.0.24-2) unstable; urgency=high
+
+  * 5.0.24-1 introduced an ABI incompatibility, which this patch reverts.
+    Programs compiled against 5.0.24-1 are not compatible with any other
+    version and needs a rebuild.
+    This bug already caused a lot of segfaults and crashes in various 
+    programs. Thanks to Chad MILLER from MySQL for quickly providing a patch.
+    The shlibdeps version has been increased to 5.0.24-2.
+    Closes: #384047, #384221, #383700
+
+ -- Christian Hammers <ch at debian.org>  Fri, 25 Aug 2006 21:47:35 +0200
+
+mysql-dfsg-5.0 (5.0.24-1) unstable; urgency=high
+ 
+  * SECURITY: Upstream fixes a security bug which allows a user to continue
+    accessing a table using a MERGE TABLE after the right to direct access to
+    the database has been revoked (CVE-2006-4031, MySQL bug #15195).
+    (Well they did not exactly fixed it, they documented the behaviour and
+    allow the admin to disable merge table alltogether...). Closes: #380271
+  * SECURITY: Applied patch that fixes a possibly insecure filehandling
+    in the recently added mysql_upgrade binary file (MySQL bug #10320).
+  * New upstream version.
+    - Fixes nasty MySQL bug #19618 that leads to crashes when using
+      "SELECT ... WHERE ... not in (1, -1)" (e.g. vbulletin was affected).
+    - Fixes upstream bug #16803 so that linking ~/.mysql_history to /dev/null
+      now has the desired effect of having no history.
+  * Really fixed the runlevels. Closes: #377651
+  * Added patch for broken upstream handling of "host=" to mysql_upgrade.c.
+  * Adjusted /etc/mysql/debian-start to new mysql_upgrade.c
+
+ -- Christian Hammers <ch at debian.org>  Tue,  8 Aug 2006 00:44:13 +0200
+
+mysql-dfsg-5.0 (5.0.22-5) unstable; urgency=low
+
+  * Added further line to the logcheck ignore files (thanks to Paul Wise).
+    Closes: #381038
+
+ -- Christian Hammers <ch at debian.org>  Wed,  2 Aug 2006 00:28:50 +0200
+
 mysql-dfsg-5.0 (5.0.22-4) unstable; urgency=low
 
   * Upstream fixes a bug in the (never released) version 5.0.23 which could

Modified: branches/sid-5.1/debian/control
===================================================================
--- branches/sid-5.1/debian/control	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/control	2007-08-25 17:53:50 UTC (rev 911)
@@ -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>, Adam Conrad <adconrad at 0c3.net>
-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, linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 Standards-Version: 3.7.2
 
 Package: libmysqlclient15off
@@ -12,7 +12,7 @@
 Depends: mysql-common (>= ${Source-Version}), ${shlibs:Depends}
 Conflicts: libmysqlclient15
 Replaces: libmysqlclient15
-Description: mysql database client library
+Description: MySQL database client library
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MySQL are speed, robustness and
@@ -26,7 +26,7 @@
 Depends: libmysqlclient15off (>= ${Source-Version}), zlib1g-dev, , ${shlibs:Depends}
 Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev
 Provides: libmysqlclient-dev
-Description: mysql database development files
+Description: MySQL database development files
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MySQL are speed, robustness and
@@ -41,13 +41,14 @@
 Conflicts: mysql-common-4.1
 Provides: mysql-common-4.1
 Replaces: mysql-common-4.1
-Description: mysql database common files (e.g. /etc/mysql/my.cnf)
+Description: MySQL database common files (e.g. /etc/mysql/my.cnf)
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MySQL are speed, robustness and
  ease of use.
  .
- This package includes files needed by all versions of the client library.
+ This package includes files needed by all versions of the client library
+ (e.g. /etc/mysql/my.cnf).
 
 Package: mysql-client-5.1
 Architecture: any
@@ -55,7 +56,7 @@
 Provides: virtual-mysql-client, mysql-client, mysql-client-4.1
 Conflicts: mysql-client (<< ${Source-Version}), mysql-client-5.0
 Replaces: mysql-client (<< ${Source-Version}), mysql-client-5.0
-Description: mysql database client binaries
+Description: MySQL database client binaries
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MySQL are speed, robustness and
@@ -73,7 +74,7 @@
 Conflicts: mysql-server (<< ${Source-Version}), mysql-server-4.1
 Provides: mysql-server, virtual-mysql-server, mysql-server-5.0
 Replaces: mysql-server (<< ${Source-Version}), mysql-server-5.0
-Description: mysql database server binaries                                     
+Description: MySQL database server binaries                                     
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MySQL are speed, robustness and
@@ -84,16 +85,22 @@
 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 (meta package 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 version
- you want, as this is the one we consider to be in the best shape.
+ maintainers. Install this package if in doubt about which MySQL
+ version you need. That will install the version recommended by the
+ package maintainers.
+ .
+ MySQL is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MySQL are speed, robustness and
+ ease of use.
 
 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 (meta package 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

Modified: branches/sid-5.1/debian/mysql-client-5.1.files
===================================================================
--- branches/sid-5.1/debian/mysql-client-5.1.files	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/mysql-client-5.1.files	2007-08-25 17:53:50 UTC (rev 911)
@@ -37,5 +37,4 @@
 usr/share/man/man1/mysqlshow.1
 usr/share/man/man1/mysql_tableinfo.1
 usr/share/man/man1/mysql_waitpid.1
-usr/share/menu/innotop
 usr/share/perl5/InnoDBParser.pm

Modified: branches/sid-5.1/debian/mysql-client-5.1.lintian-overrides
===================================================================
--- branches/sid-5.1/debian/mysql-client-5.1.lintian-overrides	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/mysql-client-5.1.lintian-overrides	2007-08-25 17:53:50 UTC (rev 911)
@@ -1 +1,3 @@
 mysql-client-5.1: package-has-a-duplicate-relation
+mysql-client-5.1: wrong-name-for-upstream-changelog usr/share/doc/mysql-client-5.0/changelog.innotop.gz
+mysql-client-5.1: pkg-not-in-package-test innotop

Added: branches/sid-5.1/debian/mysql-client-5.1.menu
===================================================================
--- branches/sid-5.1/debian/mysql-client-5.1.menu	                        (rev 0)
+++ branches/sid-5.1/debian/mysql-client-5.1.menu	2007-08-25 17:53:50 UTC (rev 911)
@@ -0,0 +1,2 @@
+?package(innotop):needs="text" section="Apps/Databases"\
+  title="innotop" command="/usr/bin/innotop"

Modified: branches/sid-5.1/debian/mysql-server-5.1.README.Debian
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.README.Debian	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/mysql-server-5.1.README.Debian	2007-08-25 17:53:50 UTC (rev 911)
@@ -105,3 +105,13 @@
 Support for BerkeleyDB has been removed in 5.1, and consequently both the
 have-bdb and skip-bdb configuration options will cause the server to fail. 
 Removing the options from /etc/mysql/my.cnf will fix this problem.
+
+* FURTHER NOTES ON REPLICATION
+===============================
+If the MySQL server is acting as a replication slave, you should not
+set --tmpdir to point to a directory on a memory-based filesystem or to
+a directory that is cleared when the server host restarts. A replication
+slave needs some of its temporary files to survive a machine restart so
+that it can replicate temporary tables or LOAD DATA INFILE operations. If
+files in the temporary file directory are lost when the server restarts,
+replication fails.

Modified: branches/sid-5.1/debian/mysql-server-5.1.config
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.config	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/mysql-server-5.1.config	2007-08-25 17:53:50 UTC (rev 911)
@@ -5,11 +5,43 @@
 if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
 ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
 
+CNF=/etc/mysql/my.cnf
+
 # Beware that there are two ypwhich one of them needs the 2>/dev/null!
 if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
-  db_input high mysql-server-5.1/nis_warning || true
+  db_input high mysql-server-5.0/nis_warning || true
   db_go
 fi
 
-db_input medium mysql-server-5.1/mysql_install_db_notes || true
-db_go
+# only ask this question on fresh installs and during "reconfiguration".  
+# 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
+fi
+
+# If this is an upgrade of an already existing installation ask the user if
+# we may use the backwards incompatible but more secure password format.
+# This should not be shown at dpkg-reconfigure, except for the dist-upgrade,
+# my.cnf is for the admin only!
+# Read: If mysql was already installed but not from Etch and it was either 4.0
+# or had old_passwords enabled before then the system is affected.
+if [ -n "$DEBIAN_SCRIPT_TRACE" ]; then
+  set +e
+  [ "$1" = "configure" ]; x1=$?
+  [ -f $CNF ]; x2=$?
+  [ ! -f /var/lib/mysql/debian-4.1.flag ]; x31=$?
+  egrep -q -i '^[[:space:]]*old.passwords[[:space:]]*=[[:space:]]*(1|true)' $CNF; x32=$?
+  set -e
+fi 
+if [ "$1" = "configure" ] && 
+   [ -f $CNF ] && 
+   (
+     [ ! -f /var/lib/mysql/debian-4.1.flag ] ||
+     egrep -q -i '^[[:space:]]*old.passwords[[:space:]]*=[[:space:]]*(1|true)' $CNF
+   ) 
+then
+	db_input medium mysql-server-5.0/need_sarge_compat || true
+	db_go
+fi

Modified: branches/sid-5.1/debian/mysql-server-5.1.templates
===================================================================
--- branches/sid-5.1/debian/mysql-server-5.1.templates	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/mysql-server-5.1.templates	2007-08-25 17:53:50 UTC (rev 911)
@@ -1,23 +1,38 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# for an advice to debian-l10n-english at lists.debian.org
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: mysql-server-5.1/really_downgrade
 Type: boolean
 Default: false
-_Description: Do you really want to downgrade?
- WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates that a
- mysql-server package with a higher version has been installed before.
- It can not be guaranteed that this version can use its data.
+_Description: Really proceed with downgrade?
+ A file named /var/lib/mysql/debian-*.flag exists on this system.
+ .
+ Such file is an indication that a mysql-server package with a higher
+ version has been installed earlier.
+ .
+ There is no guarantee that the version you're currently installing
+ will be able to use the current databases.
 
 Template: mysql-server-5.1/nis_warning
 Type: note
-_Description: Important note for NIS/YP users!
- To use mysql you must install an equivalent user and group to the
- following and ensure yourself that /var/lib/mysql has the right
- permissions (the uid/gid may be different).
+#flag:translate!:3,5
+_Description: Important note for NIS/YP users
+ To use MySQL, the following entries for users and groups should be added
+ to the system:
  .
- /etc/passwd:      mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false
+  /etc/passwd   : mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false
+  /etc/group    : mysql:x:101:
  .
- /etc/group:       mysql:x:101:
- .
- /var/lib/mysql:   drwxr-xr-x   mysql    mysql
+ You should also check the permissions and the owner of the
+ /var/lib/mysql directory:
+  .
+  /var/lib/mysql: drwxr-xr-x   mysql    mysql
 
 Template: mysql-server-5.1/mysql_install_db_notes
 Type: note
@@ -42,16 +57,20 @@
 Template: mysql-server-5.1/postrm_remove_databases
 Type: boolean
 Default: false
-_Description: Remove the databases from all MySQL versions?
- Should I remove the complete /var/lib/mysql directory tree which is used by
- all MySQL versions, not necessarily only the one you are about to purge?
+_Description: Remove all MySQL databases?
+ The /var/lib/mysql directory which contains the MySQL databases is about
+ to be removed.
+ .
+ If you're removing the MySQL package in order to later install a more
+ recent version or if a different mysql-server package is already
+ using it, the data should be kept.
 
 Template: mysql-server-5.1/start_on_boot
 Type: boolean
 Default: true
-_Description: Should MySQL start on boot?
- The MySQL can start on boot time or only if you type '/etc/init.d/mysql
- start' manually. Select 'yes' here if you want it to start automatically.
+_Description: Start the MySQL server on boot?
+ The MySQL server can be launched automatically at boot time or manually
+ with the '/etc/init.d/mysql start' command.
 
 Template: mysql-server-5.1/no_upgrade_with_isam_tables
 Type: note
@@ -62,3 +81,24 @@
  The installation of mysql-server-5.1 will now abort. In case your old
  mysql-server-4.1 gets removed nevertheless just reinstall it to convert
  those tables.
+
+Template: mysql-server/root_password
+Type: password
+_Description: New password for the MySQL "root" user:
+ While not mandatory, it is highly recommended that you set a password
+ for the MySQL administrative "root" user.
+ .
+ If that field is left blank, the password will not be changed.
+
+Template: mysql-server/error_setting_password
+Type: error
+_Description: Unable to set password for the MySQL "root" user
+ An error occurred while setting the password for the MySQL
+ administrative user. This may have happened because the account
+ already has a password, or because of a communication problem with
+ the MySQL server.
+ .
+ You should check the account's password after the package installation.
+ .
+ Please read the /usr/share/doc/mysql-server-5.0/README.Debian file
+ for more information.

Modified: branches/sid-5.1/debian/patches/00list
===================================================================
--- branches/sid-5.1/debian/patches/00list	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/patches/00list	2007-08-25 17:53:50 UTC (rev 911)
@@ -2,7 +2,6 @@
 01_MAKEFILES__Docs_Makefile.in.dpatch
 19_man__documentation_reference.dpatch
 33_scripts__mysql_create_system_tables__no_test.dpatch
-37_scripts__mysqld_safe.sh__syslog.dpatch
 38_scripts__mysqld_safe.sh__signals.dpatch
 41_scripts__mysql_install_db.sh__no_test.dpatch
 85_ndb__staticlib.dpatch

Deleted: branches/sid-5.1/debian/patches/37_scripts__mysqld_safe.sh__syslog.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/37_scripts__mysqld_safe.sh__syslog.dpatch	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/patches/37_scripts__mysqld_safe.sh__syslog.dpatch	2007-08-25 17:53:50 UTC (rev 911)
@@ -1,155 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 37_scripts__mysqld_safe.sh__syslog.dpatch by  <ch at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: scripts__mysqld_safe.sh__syslog
-
- at DPATCH@
-
---- old/scripts/mysqld_safe.sh	2006-06-02 20:01:24.000000000 +0200
-+++ new/scripts/mysqld_safe.sh	2006-07-29 13:10:20.000000000 +0200
-@@ -13,6 +13,9 @@
- KILL_MYSQLD=1;
- MYSQLD=
- 
-+# This command can be used as pipe to syslog. With "-s" it also logs to stderr.
-+ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i"
-+
- trap '' 1 2 3 15			# we shouldn't let anyone kill us
- 
- umask 007
-@@ -75,7 +78,6 @@
- 
-       # these might have been set in a [mysqld_safe] section of my.cnf
-       # they are added to mysqld command line to override settings from my.cnf
--      --log-error=*) err_log=`echo "$arg" | sed -e "s;--log-error=;;"` ;;
-       --socket=*)  mysql_unix_port=`echo "$arg" | sed -e "s;--socket=;;"` ;;
-       --port=*)    mysql_tcp_port=`echo "$arg" | sed -e "s;--port=;;"` ;;
- 
-@@ -179,7 +181,6 @@
- 
- # these rely on $DATADIR by default, so we'll set them later on
- pid_file=
--err_log=
- 
- # Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe]
- # and then merge with the command line arguments
-@@ -247,30 +248,6 @@
- fi
- append_arg_to_args "--pid-file=$pid_file"
- 
--if [ -n "$err_log" ]
--then
--  # mysqld adds ".err" if there is no extension on the --log-err
--  # argument; must match that here, or mysqld_safe will write to a
--  # different log file than mysqld
--
--  # mysqld does not add ".err" to "--log-error=foo."; it considers a
--  # trailing "." as an extension
--  if expr "$err_log" : '.*\.[^/]*$' > /dev/null
--  then
--      :
--  else
--    err_log="$err_log".err
--  fi
--
--  case "$err_log" in
--    /* ) ;;
--    * ) err_log="$DATADIR/$err_log" ;;
--  esac
--else
--  err_log=$DATADIR/`@HOSTNAME@`.err
--fi
--append_arg_to_args "--log-error=$err_log"
--
- if test -n "$mysql_unix_port"
- then
-   append_arg_to_args "--socket=$mysql_unix_port"
-@@ -339,8 +316,6 @@
-   then
-     USER_OPTION="--user=$user"
-   fi
--  # If we are root, change the err log to the right user.
--  touch $err_log; chown $user $err_log
-   if test -n "$open_files"
-   then
-     ulimit -n $open_files
-@@ -362,18 +337,16 @@
-   then
-     if @FIND_PROC@
-     then    # The pid contains a mysqld process
--      echo "A mysqld process already exists"
--      echo "A mysqld process already exists at " `date` >> $err_log
-+      echo "A mysqld process already exists" | $ERR_LOGGER -s
-       exit 1
-     fi
-   fi
-   rm -f $pid_file
-   if test -f $pid_file
-   then
--    echo "Fatal error: Can't remove the pid file: $pid_file"
--    echo "Fatal error: Can't remove the pid file: $pid_file at " `date` >> $err_log
--    echo "Please remove it manually and start $0 again"
--    echo "mysqld daemon not started"
-+    echo "Fatal error: Can't remove the pid file: $pid_file" | $ERR_LOGGER -s
-+    echo "Please remove it manually and start $0 again" | $ERR_LOGGER -s
-+    echo "mysqld daemon not started" | $ERR_LOGGER -s
-     exit 1
-   fi
- fi
-@@ -390,7 +363,7 @@
- # $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check $DATADIR/*/*.MYI
- # $MY_BASEDIR_VERSION/bin/isamchk --silent --force $DATADIR/*/*.ISM
- 
--echo "Starting $MYSQLD daemon with databases from $DATADIR"
-+echo "Starting $MYSQLD daemon with databases from $DATADIR" | $ERR_LOGGER -s
- 
- # Does this work on all systems?
- #if type ulimit | grep "shell builtin" > /dev/null
-@@ -398,7 +371,7 @@
- #  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
- #fi
- 
--echo "`date +'%y%m%d %H:%M:%S  mysqld started'`" >> $err_log
-+echo "started" | $ERR_LOGGER -s
- while true
- do
-   rm -f $safe_mysql_unix_port $pid_file	# Some extra safety
-@@ -410,7 +383,7 @@
-   do
-     cmd="$cmd "`shell_quote_string "$i"`
-   done
--  cmd="$cmd $args >> "`shell_quote_string "$err_log"`" 2>&1"
-+  cmd="$cmd $args 2>&1 | $ERR_LOGGER -t mysqld"
-   #echo "Running mysqld: [$cmd]"
-   eval "$cmd"
- 
-@@ -429,7 +402,7 @@
-     # kill -9 is used or the process won't react on the kill.
-     numofproces=`ps xaww | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"`
- 
--    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
-+    echo "Number of processes running now: $numofproces" | $ERR_LOGGER -s
-     I=1
-     while test "$I" -le "$numofproces"
-     do 
-@@ -442,16 +415,14 @@
-       #    echo "TEST $I - $T **"
-       if kill -9 $T
-       then
--        echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log
-+        echo "$MYSQLD process hanging, pid $T - killed" | $ERR_LOGGER -s
-       else 
-         break
-       fi
-       I=`expr $I + 1`
-     done
-   fi
--  echo "`date +'%y%m%d %H:%M:%S'`  mysqld restarted" | tee -a $err_log
-+  echo "restarted" | $ERR_LOGGER -s
- done
- 
--echo "`date +'%y%m%d %H:%M:%S'`  mysqld ended" | tee -a $err_log
--echo "" | tee -a $err_log
--
-+echo "ended" | $ERR_LOGGER -s

Modified: branches/sid-5.1/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch	2007-08-25 17:53:50 UTC (rev 911)
@@ -17,6 +17,15 @@
  umask 007
  
  defaults=
+@@ -122,7 +122,7 @@
+       # sed buffers output (only GNU sed supports a -u (unbuffered) option)
+       # which means that messages may not get sent to syslog until the
+       # mysqld process quits.
+-      cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error"
++      cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error & wait"
+       ;;
+     *)
+       echo "Internal program error (non-fatal):" \
 @@ -352,6 +350,13 @@
  fi
  
@@ -31,12 +40,3 @@
  # Uncomment the following lines if you want all tables to be automatically
  # checked and repaired during startup. You should add sensible key_buffer
  # and sort_buffer values to my.cnf to improve check performance or require
-@@ -383,7 +388,7 @@
-   do
-     cmd="$cmd "`shell_quote_string "$i"`
-   done
--  cmd="$cmd $args 2>&1 | $ERR_LOGGER -t mysqld"
-+  cmd="$cmd $args 2>&1 | $ERR_LOGGER -t mysqld & wait"
-   #echo "Running mysqld: [$cmd]"
-   eval "$cmd"
- 

Modified: branches/sid-5.1/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch	2007-08-25 17:53:50 UTC (rev 911)
@@ -9,17 +9,12 @@
 
 --- old/scripts/mysql_install_db.sh	2007-06-11 23:31:22.000000000 +0200
 +++ new/scripts/mysql_install_db.sh	2007-06-11 23:31:48.000000000 +0200
-@@ -259,12 +259,8 @@
-   mkdir $ldata/mysql;
-   chmod 700 $ldata/mysql ;
+@@ -345,7 +345,7 @@
  fi
--if test ! -d $ldata/test; then
--  mkdir $ldata/test;
--  chmod 700 $ldata/test ;
--fi
- if test -w / -a ! -z "$user"; then
--  chown $user $ldata $ldata/mysql $ldata/test;
-+  chown $user $ldata $ldata/mysql;
- fi
  
- if test -n "$user"; then
+ # Create database directories mysql & test
+-for dir in $ldata $ldata/mysql $ldata/test
++for dir in $ldata $ldata/mysql
+ do
+   if test ! -d $dir
+   then

Modified: branches/sid-5.1/debian/patches/85_ndb__staticlib.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/85_ndb__staticlib.dpatch	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/patches/85_ndb__staticlib.dpatch	2007-08-25 17:53:50 UTC (rev 911)
@@ -18,12 +18,12 @@
              $(top_builddir)/dbug/libdbug.a \
              $(top_builddir)/mysys/libmysys.a \
              $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
---- old/storage/ndb/src/mgmsrv/Makefile.in	2007-01-31 01:42:25.000000000 +0100
-+++ new/storage/ndb/src/mgmsrv/Makefile.in	2007-01-31 01:42:51.000000000 +0100
-@@ -406,7 +406,7 @@
+--- old/storage/ndb/src/mgmsrv/Makefile.in	2007-08-25 14:48:43.000000000 +0200
++++ new/storage/ndb/src/mgmsrv/Makefile.in	2007-08-25 14:49:23.000000000 +0200
+@@ -453,7 +453,7 @@
                 -I$(top_srcdir)/storage/ndb/src/mgmclient
  
- LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.o \
+ LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.lo \
 -            $(top_builddir)/storage/ndb/src/libndbclient.la \
 +            $(top_builddir)/storage/ndb/src/.libs/libndbclient.a \
              $(top_builddir)/dbug/libdbug.a \

Added: branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch	                        (rev 0)
+++ branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch	2007-08-25 17:53:50 UTC (rev 911)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_upstreamdebiandir.dpatch by  <sean at rangda.stickybit.se>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mysql-dfsg-5.0-5.0.45~/configure mysql-dfsg-5.0-5.0.45/configure
+--- mysql-dfsg-5.0-5.0.45~/configure	2007-07-04 15:10:10.000000000 +0200
++++ mysql-dfsg-5.0-5.0.45/configure	2007-07-17 14:55:49.000000000 +0200
+@@ -41876,7 +41876,7 @@
+ 
+ 
+ # Output results
+-                                                                                                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile extra/Makefile mysys/Makefile strings/Makefile regex/Makefile heap/Makefile myisam/Makefile myisammrg/Makefile os2/Makefile os2/include/Makefile os2/include/sys/Makefile man/Makefile BUILD/Makefile vio/Makefile libmysql/Makefile client/Makefile pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile sql-common/Makefile SSL/Makefile dbug/Makefile scripts/Makefile include/Makefile sql-bench/Makefile server-tools/Makefile server-tools/instance-manager/Makefile tests/Makefile Docs/Makefile support-files/Makefile support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile mysql-test/Makefile netware/Makefile include/mysql_version.h cmd-line-utils/Makefile cmd-line-utils/libedit/Makefile win/Makefile zlib/Makefile debian/Makefile debian/defs.mk debian/control cmd-line-utils/readline/Makefile"
++                                                                                                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile extra/Makefile mysys/Makefile strings/Makefile regex/Makefile heap/Makefile myisam/Makefile myisammrg/Makefile os2/Makefile os2/include/Makefile os2/include/sys/Makefile man/Makefile BUILD/Makefile vio/Makefile libmysql/Makefile client/Makefile pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile sql-common/Makefile SSL/Makefile dbug/Makefile scripts/Makefile include/Makefile sql-bench/Makefile server-tools/Makefile server-tools/instance-manager/Makefile tests/Makefile Docs/Makefile support-files/Makefile support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile mysql-test/Makefile netware/Makefile include/mysql_version.h cmd-line-utils/Makefile cmd-line-utils/libedit/Makefile win/Makefile zlib/Makefile cmd-line-utils/readline/Makefile"
+ 
+            ac_config_commands="$ac_config_commands default"
+ 
+@@ -42602,9 +42602,6 @@
+   "cmd-line-utils/libedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd-line-utils/libedit/Makefile" ;;
+   "win/Makefile" ) CONFIG_FILES="$CONFIG_FILES win/Makefile" ;;
+   "zlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES zlib/Makefile" ;;
+-  "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+-  "debian/defs.mk" ) CONFIG_FILES="$CONFIG_FILES debian/defs.mk" ;;
+-  "debian/control" ) CONFIG_FILES="$CONFIG_FILES debian/control" ;;
+   "cmd-line-utils/readline/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd-line-utils/readline/Makefile" ;;
+   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;


Property changes on: branches/sid-5.1/debian/patches/90_upstreamdebiandir.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: branches/sid-5.1/debian/rules
===================================================================
--- branches/sid-5.1/debian/rules	2007-08-18 08:33:41 UTC (rev 910)
+++ branches/sid-5.1/debian/rules	2007-08-25 17:53:50 UTC (rev 911)
@@ -147,6 +147,7 @@
 	  sql-bench/Makefile \
 	  scripts/make_win_binary_distribution \
 	  scripts/mysqlbug \
+	  sql/gen_lex_hash \
 	  sql/lex_hash.h \
 	  strings/ctype_autoconf.c \
 	  config.log \
@@ -207,14 +208,11 @@
 	install -d $(TMP)/etc/mysql
 	install -m 0644 debian/additions/my.cnf $(TMP)/etc/mysql/my.cnf
 
-	pod2man scripts/mysqlhotcopy $(TMP)/usr/share/man/man1/mysqlhotcopy.1
-
 	# mysql-client
 	install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
 	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
 	install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
 	install -m 0644 -D debian/additions/innotop/InnoDBParser.pm $(TMP)/usr/share/perl5/InnoDBParser.pm
-	install -m 0644 -D debian/additions/innotop/innotop.menu $(TMP)/usr/share/menu/innotop
 
 	# mysql-server
 	install -m 0755 scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe




More information about the Pkg-mysql-commits mailing list