From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 837BA1381F3 for ; Tue, 28 May 2013 19:42:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 221ACE0AA5; Tue, 28 May 2013 19:42:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0503E0AA5 for ; Tue, 28 May 2013 19:42:20 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2CDE33E140 for ; Tue, 28 May 2013 19:42:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 40E15E4402 for ; Tue, 28 May 2013 19:42:18 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1369770128.ad2e63d56dca89b9b199745d96bf3e6f69763f6d.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 07110_all_mysql_gcc-4.2_5.1.69.patch X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: ad2e63d56dca89b9b199745d96bf3e6f69763f6d X-VCS-Branch: master Date: Tue, 28 May 2013 19:42:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bf4f1c5c-f6c2-48ad-a781-2d25f0defb59 X-Archives-Hash: 6dba0696a92d78cd399cb0779aaff657 commit: ad2e63d56dca89b9b199745d96bf3e6f69763f6d Author: Robin H. Johnson gentoo org> AuthorDate: Tue May 28 19:42:08 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue May 28 19:42:08 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=ad2e63d5 Isn't tweak patches by hand fun? Signed-off-by: Robin H. Johnson gentoo.org> --- 07110_all_mysql_gcc-4.2_5.1.69.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/07110_all_mysql_gcc-4.2_5.1.69.patch b/07110_all_mysql_gcc-4.2_5.1.69.patch index e897fd5..3d0a742 100644 --- a/07110_all_mysql_gcc-4.2_5.1.69.patch +++ b/07110_all_mysql_gcc-4.2_5.1.69.patch @@ -1260,13 +1260,12 @@ diff -ur mysql-orig/sql/item_func.cc mysql/sql/item_func.cc diff -ur mysql-orig/sql/item_func.h mysql/sql/item_func.h --- mysql-orig/sql/item_func.h 2012-08-14 01:12:29.423437567 +0000 +++ mysql/sql/item_func.h 2012-08-14 01:14:59.402197785 +0000 -@@ -421,7 +421,7 @@ +@@ -421,6 +421,6 @@ const char *func_name() const { return "cast_as_unsigned"; } void fix_length_and_dec() { - max_length= min(args[0]->max_length,MY_INT64_NUM_DECIMAL_DIGITS); + max_length= MYSQL_MIN(args[0]->max_length,MY_INT64_NUM_DECIMAL_DIGITS); - unsigned_flag=1; } longlong val_int(); diff -ur mysql-orig/sql/item_strfunc.cc mysql/sql/item_strfunc.cc