From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QjizC-0000j1-HG for garchives@archives.gentoo.org; Thu, 21 Jul 2011 02:27:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0733D21C1DC; Thu, 21 Jul 2011 02:27:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D0C5E21C1DC for ; Thu, 21 Jul 2011 02:27:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FAF71B4016 for ; Thu, 21 Jul 2011 02:27:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 760D38003D for ; Thu, 21 Jul 2011 02:27:29 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: 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.58.patch X-VCS-Directories: / X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: bf8c2e431145855eb3dd7de9fc683b46c9f9b8ed Date: Thu, 21 Jul 2011 02:27:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 11f929797933d10e309f851cc79288df commit: bf8c2e431145855eb3dd7de9fc683b46c9f9b8ed Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Thu Jul 21 02:26:57 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Thu Jul 21 02:26:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql-extras.= git;a=3Dcommit;h=3Dbf8c2e43 Fix broken s/max/MYSQL_MAX/ replacements on 07110_all_mysql_gcc-4.2_5.1.5= 8.patch. --- 07110_all_mysql_gcc-4.2_5.1.58.patch | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/07110_all_mysql_gcc-4.2_5.1.58.patch b/07110_all_mysql_gcc-4= .2_5.1.58.patch index 659728c..a4f56e2 100644 --- a/07110_all_mysql_gcc-4.2_5.1.58.patch +++ b/07110_all_mysql_gcc-4.2_5.1.58.patch @@ -2942,7 +2942,7 @@ diff -urN mysql-orig/storage/myisam/mi_check.c mysq= l/storage/myisam/mi_check.c */ sort_info.max_records=3D 10 * - max(param->sort_buffer_length, MIN_SORT_= BUFFER) / -+ MYSQL_MAXparam->sort_buffer_length, MIN_= SORT_BUFFER) / ++ MYSQL_MAX(param->sort_buffer_length, MIN= _SORT_BUFFER) / sort_param.key_length; } =20 @@ -2960,7 +2960,7 @@ diff -urN mysql-orig/storage/myisam/mi_check.c mysq= l/storage/myisam/mi_check.c /* 32 is just a safety margin here - (at least max(val_len, sizeof(nod_flag)) should be there). -+ (at least MYSQL_MAXval_len, sizeof(nod_flag)) should be there). ++ (at least MYSQL_MAX(val_len, sizeof(nod_flag)) should be there). May be better performance could be achieved if we'd put (sort_info->keyinfo->block_length-32)/XXX instead.