aboutsummaryrefslogtreecommitdiff
path: root/databases/mysql50-server/files
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2008-01-31 22:18:44 +0000
committerAlex Dupre <ale@FreeBSD.org>2008-01-31 22:18:44 +0000
commitb170e4c513a1d139d5200d18710efa7046962d03 (patch)
tree66b927043ce7b6a73cea7b27336736c07d682aac /databases/mysql50-server/files
parent0bcc2f4c97665928acf0faee74effd9d2a150423 (diff)
Notes
Diffstat (limited to 'databases/mysql50-server/files')
-rw-r--r--databases/mysql50-server/files/patch-sql_sql_select.cc12
1 files changed, 12 insertions, 0 deletions
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;
+ }