diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2008-01-31 22:18:44 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2008-01-31 22:18:44 +0000 |
| commit | b170e4c513a1d139d5200d18710efa7046962d03 (patch) | |
| tree | 66b927043ce7b6a73cea7b27336736c07d682aac /databases | |
| parent | 0bcc2f4c97665928acf0faee74effd9d2a150423 (diff) | |
| download | ports-b170e4c513a1d139d5200d18710efa7046962d03.tar.gz ports-b170e4c513a1d139d5200d18710efa7046962d03.zip | |
Notes
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql50-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql50-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mysql50-server/files/patch-sql_sql_select.cc | 12 |
3 files changed, 16 insertions, 4 deletions
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index ff418b72c371..3be05b8931c4 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.51 +PORTVERSION= 5.0.51a PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index cf889a98abf7..361c8681ca27 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.0.51.tar.gz) = 88c39c8cb77810febb83b7ee625364d7 -SHA256 (mysql-5.0.51.tar.gz) = b584074e80328a2e65515ef3df947a81299e3140a7ba8a7e9f8dcf4e92d5736b -SIZE (mysql-5.0.51.tar.gz) = 27045586 +MD5 (mysql-5.0.51a.tar.gz) = a83dbdbb91267daf73d2297a9c283dd1 +SHA256 (mysql-5.0.51a.tar.gz) = 59b06f6a948430c7254760e0bf16f1447ee14d0142073f58fd2e68c327330b68 +SIZE (mysql-5.0.51a.tar.gz) = 27588558 diff --git a/databases/mysql50-server/files/patch-sql_sql_select.cc b/databases/mysql50-server/files/patch-sql_sql_select.cc new file mode 100644 index 000000000000..46b099565017 --- /dev/null +++ b/databases/mysql50-server/files/patch-sql_sql_select.cc @@ -0,0 +1,12 @@ +--- sql/sql_select.cc.orig 2008-01-31 23:10:38.000000000 +0100 ++++ sql/sql_select.cc 2008-01-31 23:11:31.000000000 +0100 +@@ -1068,7 +1068,8 @@ + <fields> to ORDER BY <fields>. One exception is if skip_sort_order is + set (see above), then we can simply skip GROUP BY. + */ +- order= skip_sort_order ? 0 : group_list; ++ if (!order || test_if_subpart(group_list, order)) ++ order= skip_sort_order ? 0 : group_list; + group_list= 0; + group= 0; + } |