[debian-mysql] [PATCH 2/2] Patch fix-func_math-test-failure has been pushed upstream and removed from d/patches/

[Akhil Mohan]

---
 debian/changelog                                |  2 ++
 debian/patches/fix-func_math-test-failure.patch | 34 -------------------------
 debian/patches/series                           |  1 -
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 debian/patches/fix-func_math-test-failure.patch

diff --git a/debian/changelog b/debian/changelog
index 706c05a..9d4f01d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ mysql-5.5 (5.5.41-1) UNRELEASED; urgency=medium
   * Example option in log_slow_queries d/additions/my.cnf is deprecated
     and replaced with options slow_query_log_file and slow_query_log
     (Closes: #677222)
+  * Patch fix-func_math-test-failure has been pushed upstream and
+    removed from d/patches/
 
  -- Akhil Mohan <akhil.mohan at oracle.com>  Wed, 28 Jan 2015 19:40:41 +0530
 
diff --git a/debian/patches/fix-func_math-test-failure.patch b/debian/patches/fix-func_math-test-failure.patch
deleted file mode 100644
index 4764fc7..0000000
--- a/debian/patches/fix-func_math-test-failure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Resolve test failure due to compiler optimization break
-Author: norvald.ryeng at oracle.com
-Forwarded: no
-Bug: http://bugs.mysql.com/bug.php?id=72827
-
---- a/sql/item_func.cc
-+++ b/sql/item_func.cc
-@@ -1760,7 +1760,13 @@ longlong Item_func_neg::int_op()
-   if ((null_value= args[0]->null_value))
-     return 0;
-   if (args[0]->unsigned_flag &&
--      (ulonglong) value > (ulonglong) LONGLONG_MAX + 1)
-+      (ulonglong) value > (ulonglong) LONGLONG_MAX + 1ULL)
-+    return raise_integer_overflow();
-+  // For some platforms we need special handling of LONGLONG_MIN to
-+  // guarantee overflow.
-+  if (value == LONGLONG_MIN &&
-+      !args[0]->unsigned_flag &&
-+      !unsigned_flag)
-     return raise_integer_overflow();
-   return check_integer_overflow(-value, !args[0]->unsigned_flag && value < 0);
- }
---- a/sql/item_func.h
-+++ b/sql/item_func.h
-@@ -251,7 +251,8 @@ public:
-   inline longlong check_integer_overflow(longlong value, bool val_unsigned)
-   {
-     if ((unsigned_flag && !val_unsigned && value < 0) ||
--        (!unsigned_flag && val_unsigned && (ulonglong) value > LONGLONG_MAX))
-+        (!unsigned_flag && val_unsigned &&
-+         (ulonglong) value > (ulonglong) LONGLONG_MAX))
-       return raise_integer_overflow();
-     return value;
-   }
diff --git a/debian/patches/series b/debian/patches/series
index e3df616..14d8b17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,5 +12,4 @@ fix-mips64el-ftbfs.patch
 33_scripts__mysql_create_system_tables__no_test.patch
 41_scripts__mysql_install_db.sh__no_test.patch
 50_mysql-test__db_test.patch
-fix-func_math-test-failure.patch
 fix-mysqlhotcopy-test-failure.patch
-- 
2.1.0