Fixed bug in GROUP BY ... DESC

Docs/manual.texi:
  Changelog
libmysql/libmysql.c:
  Fixed bug with mysql_use_result() when mysql_query() is called before mysql_free_result().
mysql-test/r/group_by.result:
  New tests
mysql-test/t/group_by.test:
  New tests
sql/stacktrace.c:
  Fix for SCO

2 files changed, 54 insertions, 1 deletions

diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index 2c4a5cecbb1..d5fcc7d85e8 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -34,3 +34,33 @@ Test Procedures		0
 2	a	0
 1+1	a	count(*)
 2	a	0
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	ALL	NULL	NULL	NULL	NULL	6	Using temporary
+userid	count(*)
+3	3
+2	1
+1	2
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	range	spID	spID	5	NULL	2	where used; Using index; Using temporary
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	range	spID	spID	5	NULL	2	where used; Using index
+spid	count(*)
+1	1
+2	2
+spid	count(*)
+2	2
+1	1
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	ALL	NULL	NULL	NULL	NULL	6	Using filesort
+spid	sum(userid)
+5	3
+4	3
+3	3
+2	3
+1	1
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	index	NULL	score	3	NULL	6	Using index
+score	count(*)
+3	3
+2	1
+1	2
diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
index e75841dc6d0..efa1744feee 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -38,7 +38,6 @@ INSERT INTO t2 VALUES (3,'name','pass','mail','Y','v','n','adr','1','1','1');
 SELECT t2.userid, MIN(t1.score) FROM t1, t2 WHERE t1.userID=t2.userID GROUP BY t2.userid;
 SELECT t2.userid, MIN(t1.score) FROM t1, t2 WHERE t1.userID=t2.userID AND t1.spID=2  GROUP BY t2.userid;
 SELECT t2.userid, MIN(t1.score+0.0) FROM t1, t2 WHERE t1.userID=t2.userID AND t1.spID=2  GROUP BY t2.userid;
-
 drop table test.t1,test.t2;
 
 #
@@ -220,3 +219,27 @@ select 1+1, "a",count(*) from t1 where foo in (2);
 insert into t1 values (1);
 select 1+1,"a",count(*) from t1 where foo in (2);
 drop table t1;
+
+#
+# Test GROUP BY DESC
+
+CREATE TABLE t1 (
+  spID int(10) unsigned,
+  userID int(10) unsigned,
+  score smallint(5) unsigned,
+  key (spid),
+  key (score)
+);
+
+INSERT INTO t1 VALUES (1,1,1),(2,2,2),(2,1,1),(3,3,3),(4,3,3),(5,3,3);
+explain select userid,count(*) from t1 group by userid desc;
+select userid,count(*) from t1 group by userid desc;
+explain select spid,count(*) from t1 where spid between 1 and 2 group by spid desc;
+explain select spid,count(*) from t1 where spid between 1 and 2 group by spid;
+select spid,count(*) from t1 where spid between 1 and 2 group by spid;
+select spid,count(*) from t1 where spid between 1 and 2 group by spid desc;
+explain select sql_big_result spid,sum(userid) from t1 group by spid desc;
+select sql_big_result spid,sum(userid) from t1 group by spid desc;
+explain select sql_big_result score,count(*) from t1 group by score desc;
+select sql_big_result score,count(*) from t1 group by score desc;
+drop table t1;