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

Wed Feb 20 15:18:14 UTC 2008

tags 458695 pending
thanks

Author: mtaylor-guest
Date: 2008-02-20 15:18:13 +0000 (Wed, 20 Feb 2008)
New Revision: 1153

Added:
   trunk/debian/patches/55_testsuite-2008.dpatch
Modified:
   trunk/
   trunk/debian/changelog
   trunk/debian/patches/00list
   trunk/debian/rules
Log:
* Added Sphinx SE integration
  conflicts to ease transitions between versions.
* New patch 55_testsuite-2008.dpatch to fix FTBFS in testsuite.
  (closes: #458695)
* Don't run testsuite on alpha, arm, hppa, mipsel and sparc.


Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-12-27 18:42:01.798000097 -0600
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

   + timestamp: 2008-02-18 15:39:22.894000053 -0300
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

Name: bzr:ancestry:v3-trunk0
   - svn-v3-trunk0:bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1:trunk:1093
monty at inaugust.com-20071219005821-v5qtsv9qvi70s0mt
monty at inaugust.com-20071227223102-6uiuykhyivk9r6q9

   + svn-v3-trunk0:bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1:trunk:1093
monty at inaugust.com-20071219005821-v5qtsv9qvi70s0mt
monty at inaugust.com-20071227223102-6uiuykhyivk9r6q9
svn-v3-trunk0:bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1:trunk:1115

Name: bzr:file-ids
   - 
   + debian/patches/55_testsuite-2008.dpatch	1115 at bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1:trunk:debian%2Fpatches%2F55_testsuite-2008.dpatch

Name: bzr:revision-id:v3-trunk0
   - 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu

   + 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu
607 monty at inaugust.com-20080218183922-0rfctqrxnkvqirvz

Name: svk:merge
   - bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1:/trunk:1093

   + bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1:/trunk:1093
bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1:/trunk:1115


Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2008-02-20 15:18:10 UTC (rev 1152)
+++ trunk/debian/changelog	2008-02-20 15:18:13 UTC (rev 1153)
@@ -1,5 +1,11 @@
-mysql-dfsg-5.0 (5.0.51-2) UNRELEASED; urgency=low
+mysql-dfsg-5.0 (5.0.51-3) UNRELEASED; urgency=low
 
+  * Added Sphinx SE integration
+
+ -- Monty Taylor <monty at inaugust.com>  Wed, 02 Jan 2008 09:25:11 -0600
+
+mysql-dfsg-5.0 (5.0.51-2) unstable; urgency=low
+
   [ Monty Taylor ]
   * Added --with-system-type to set the version_compile_os field.
   * Cleaned up some lintian warnings.
@@ -8,15 +14,17 @@
   * Removed 88_mctype_attrib.dpatch, http://bugs.mysql.com/bug.php?id=25118 is
     closed with http://lists.mysql.com/commits/24337
   * Added mysql-community/mysql-enterprise virtual packages in provides and
-    conflicts to ease transitions between versions. 
-  * Added Sphinx SE integration
+    conflicts to ease transitions between versions.
 
   [ 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.
 
- -- Monty Taylor <monty at inaugust.com>  Thu, 27 Dec 2007 12:13:36 -0600
+ -- 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	2008-02-20 15:18:10 UTC (rev 1152)
+++ trunk/debian/patches/00list	2008-02-20 15:18:13 UTC (rev 1153)
@@ -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
 88_sphinx_se.dpatch
 89_ndb__staticlib.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-02-20 15:18:13 UTC (rev 1153)
@@ -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;

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-02-20 15:18:10 UTC (rev 1152)
+++ trunk/debian/rules	2008-02-20 15:18:13 UTC (rev 1153)
@@ -29,6 +29,10 @@
     USE_ASSEMBLER=--enable-assembler 
 endif
 
+ifneq ($(findstring $(ARCH), alpha arm hppa mipsel sparc),$(ARCH))
+    RUN_TESTSUITE=1
+endif
+
 # This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf
 # so it is disabled by default although, according to MySQL, it brings >10%
 # performance gain if enabled. See #299382.
@@ -119,7 +123,7 @@
 
 	$(MAKE) $(MAKE_J)
 
-	if [ ! -f testsuite-stamp ] ; then \
+	if [ "$(RUN_TESTSUITE)" == "1" ] && [ ! -f testsuite-stamp ] ; then \
 	  cd mysql-test ; \
 	  /usr/bin/perl ./mysql-test-run.pl --mysqld=--user=root --force ; \
 	  /usr/bin/perl ./mysql-test-run.pl --mysqld=--user=root --force --ps-protocol ; \


