← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mariadb-5.5/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/33_scripts__mysql_create_system_tables__no_test.diff

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen, Otto Kekäläinen, James Page
  • Date: 2014-03-02 01:38:26 UTC
  • mfrom: (2.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20140302013826-z3afnfteqo86pccd
Tags: 5.5.36-1
http://bugs.debian.org/739750
http://bugs.debian.org/739841
http://bugs.debian.org/739360
[ Otto Kekäläinen ]
* New upstream release.
* Updated Danish debconf translation (Closes: #739750).
* d/control: Added explicit Conflicts/Replaces for mysql-5.6 packages
  (Closes: #739841).
* d/control: Update for use of virtual-* packages for switching to/from
  MySQL alternatives.

[ James Page ]
* d/control: Drop Nicholas from Uploaders, MIA (Closes: #739360).
* d/control: Add libjemalloc-dev to BD's.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/33_scripts__mysql_create_system_tables__no_test.diff
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
1
## 33_scripts__mysql_create_system_tables__no_test.dpatch by  <ch@debian.org>
3
2
##
4
3
## All lines beginning with `## DP:' are a description of the patch.
7
6
## DP: circumstances as it is checked first. See #301741.
8
7
## DP: http://bugs.mysql.com/bug.php?id=6901
9
8
 
10
 
@DPATCH@
11
9
--- old/scripts/mysql_system_tables_data.sql    2008-12-04 22:59:44.000000000 +0100
12
10
+++ new/scripts/mysql_system_tables_data.sql    2008-12-04 23:00:07.000000000 +0100
13
11
@@ -30,8 +30,6 @@ SELECT LOWER( REPLACE((SELECT REPLACE(@@