[Pkg-mysql-commits] r1115 - in trunk/debian: . patches

[Norbert Tretkowski]

tags 458695 pending
thanks

Author: nobse
Date: 2008-01-02 13:02:46 +0000 (Wed, 02 Jan 2008)
New Revision: 1115

Added:
   trunk/debian/patches/55_testsuite-2008.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
Fix FTBFS in testsuite.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-31 12:01:51 UTC (rev 1114)
+++ trunk/debian/changelog	2008-01-02 13:02:46 UTC (rev 1115)
@@ -13,10 +13,12 @@
   [ Norbert Tretkowski ]
   * Add -fPIC to CFLAGS to allow other packages to be built against
     libmysqld.a on amd64. (closes: #457915)
+  * New patch 55_testsuite-2008.dpatch to fix FTBFS in testsuite.
+    (closes: #458695)
   * New patch 54_ssl-client-support.dpatch to fix SSL client support.
   * Don't run testsuite on alpha, arm, hppa, mipsel and sparc.
 
- -- Norbert Tretkowski <nobse at debian.org>  Mon, 31 Dec 2007 12:20:15 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Wed, 02 Jan 2008 13:55:39 +0100
 
 mysql-dfsg-5.0 (5.0.51-1) unstable; urgency=low
 

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2007-12-31 12:01:51 UTC (rev 1114)
+++ trunk/debian/patches/00list	2008-01-02 13:02:46 UTC (rev 1115)
@@ -11,6 +11,7 @@
 52_ndb-gcc-4.2.dpatch
 53_integer-gcc-4.2.dpatch
 54_ssl-client-support.dpatch
+55_testsuite-2008.dpatch
 86_PATH_MAX.dpatch
 89_ndb__staticlib.dpatch
 90_upstreamdebiandir.dpatch

Added: trunk/debian/patches/55_testsuite-2008.dpatch
===================================================================
--- trunk/debian/patches/55_testsuite-2008.dpatch	                        (rev 0)
+++ trunk/debian/patches/55_testsuite-2008.dpatch	2008-01-02 13:02:46 UTC (rev 1115)
@@ -0,0 +1,67 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55_testsuite-2008.dpatch by Norbert Tretkowski <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://bugs.mysql.com/bug.php?id=33623
+
+ at DPATCH@
+diff -Nrup a/mysql-test/r/view.result b/mysql-test/r/view.result
+--- a/mysql-test/r/view.result	2007-09-24 17:34:09 +05:00
++++ b/mysql-test/r/view.result	2007-10-10 12:16:12 +05:00
+@@ -2706,18 +2706,19 @@ CREATE TABLE t1(
+ fName varchar(25) NOT NULL,
+ lName varchar(25) NOT NULL,
+ DOB date NOT NULL,
++test_date date NOT NULL,
+ uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY);
+-INSERT INTO t1(fName, lName, DOB) VALUES
+-('Hank', 'Hill', '1964-09-29'),
+-('Tom', 'Adams', '1908-02-14'),
+-('Homer', 'Simpson', '1968-03-05');
++INSERT INTO t1(fName, lName, DOB, test_date) VALUES
++('Hank', 'Hill', '1964-09-29', '2007-01-01'),
++('Tom', 'Adams', '1908-02-14', '2007-01-01'),
++('Homer', 'Simpson', '1968-03-05', '2007-01-01');
+ CREATE VIEW v1 AS
+-SELECT (year(now())-year(DOB)) AS Age
++SELECT (year(test_date)-year(DOB)) AS Age
+ FROM t1 HAVING Age < 75;
+ SHOW CREATE VIEW v1;
+ View	Create View
+-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(now()) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75)
+-SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75;
++v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(`t1`.`test_date`) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75)
++SELECT (year(test_date)-year(DOB)) AS Age FROM t1 HAVING Age < 75;
+ Age
+ 43
+ 39
+diff -Nrup a/mysql-test/t/view.test b/mysql-test/t/view.test
+--- a/mysql-test/t/view.test	2007-09-24 17:34:09 +05:00
++++ b/mysql-test/t/view.test	2007-10-10 12:16:12 +05:00
+@@ -2548,19 +2548,20 @@ CREATE TABLE t1(
+   fName varchar(25) NOT NULL,
+   lName varchar(25) NOT NULL,
+   DOB date NOT NULL,
++  test_date date NOT NULL,
+   uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY);
+  
+-INSERT INTO t1(fName, lName, DOB) VALUES
+-  ('Hank', 'Hill', '1964-09-29'),
+-  ('Tom', 'Adams', '1908-02-14'),
+-  ('Homer', 'Simpson', '1968-03-05');
++INSERT INTO t1(fName, lName, DOB, test_date) VALUES
++  ('Hank', 'Hill', '1964-09-29', '2007-01-01'),
++  ('Tom', 'Adams', '1908-02-14', '2007-01-01'),
++  ('Homer', 'Simpson', '1968-03-05', '2007-01-01');
+ 
+ CREATE VIEW v1 AS
+-  SELECT (year(now())-year(DOB)) AS Age
++  SELECT (year(test_date)-year(DOB)) AS Age
+     FROM t1 HAVING Age < 75; 
+ SHOW CREATE VIEW v1;           
+ 
+-SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75;
++SELECT (year(test_date)-year(DOB)) AS Age FROM t1 HAVING Age < 75;
+ SELECT * FROM v1;
+ 
+ DROP VIEW v1;