bk commit into 4.1 tree (evgen:1.2469)

[eugene]

Below is the list of changes that have just been committed into a local
4.1 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2469 05/10/27 17:44:28 evgen@stripped +5 -0
  Manually merged

  netware/mysql_test_run.c
    1.14 05/10/27 17:44:26 evgen@stripped +1 -2
    Manually merged

  mysql-test/t/select.test
    1.53 05/10/27 17:44:26 evgen@stripped +0 -0
    Manuall merged fix for bug#13855

  mysql-test/r/select.result
    1.69 05/10/27 17:44:26 evgen@stripped +0 -0
    Manually merged fix for bug#13855

  sql/sql_select.cc
    1.441 05/10/27 17:36:17 evgen@stripped +0 -0
    Auto merged

  include/config-netware.h
    1.9 05/10/27 17:36:17 evgen@stripped +0 -4
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/13855-bug-4.1-mysql/RESYNC

--- 1.440/sql/sql_select.cc	2005-10-13 18:25:25 +04:00
+++ 1.441/sql/sql_select.cc	2005-10-27 17:36:17 +04:00
@@ -689,6 +689,7 @@
   {
     order=0;					// The output has only one row
     simple_order=1;
+    select_distinct= 0;                       // No need in distinct for 1 row
   }
 
   calc_group_buffer(this, group_list);

--- 1.13/netware/mysql_test_run.c	2005-10-26 17:12:34 +04:00
+++ 1.14/netware/mysql_test_run.c	2005-10-27 17:44:26 +04:00
@@ -172,7 +172,7 @@
     log_msg("\nFailed %u/%u test(s), %.02f%% successful.\n",
       total_fail, total_test, percent);
 		log_msg("\nThe .out and .err files in %s may give you some\n", result_dir);
-		log_msg("hint of what when wrong.\n");
+		log_msg("hint of what went wrong.\n");
 		log_msg("\nIf you want to report this error, please first read the documentation\n");
 		log_msg("at: http://www.mysql.com/doc/en/MySQL_test_suite.html\n");
   }

--- 1.68/mysql-test/r/select.result	2005-10-13 18:51:03 +04:00
+++ 1.69/mysql-test/r/select.result	2005-10-27 17:44:26 +04:00
@@ -2400,6 +2400,14 @@
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	
 1	SIMPLE	t2	ref	a	a	23	test.t1.a	2	
 DROP TABLE t1, t2;
+create table t1 (f1 int primary key, f2 int);
+create table t2 (f3 int, f4 int, primary key(f3,f4));
+insert into t1 values (1,1);
+insert into t2 values (1,1),(1,2);
+select distinct count(f2) >0 from t1 left join t2 on f1=f3 group by f1;
+count(f2) >0
+1
+drop table t1,t2;
 CREATE TABLE t1 ( city char(30) );
 INSERT INTO t1 VALUES ('London');
 INSERT INTO t1 VALUES ('Paris');

--- 1.52/mysql-test/t/select.test	2005-10-13 18:51:03 +04:00
+++ 1.53/mysql-test/t/select.test	2005-10-27 17:44:26 +04:00
@@ -2228,4 +2228,13 @@
 WHERE t2.a = t1.a AND t2.b = t1.b GROUP BY a, b, c;
 DROP TABLE IF EXISTS t1, t2;
 
+#
+# Bug #13855 select distinct with group by caused server crash
+#
+create table t1 (f1 int primary key, f2 int);
+create table t2 (f3 int, f4 int, primary key(f3,f4));
+insert into t1 values (1,1);
+insert into t2 values (1,1),(1,2);
+select distinct count(f2) >0 from t1 left join t2 on f1=f3 group by f1;
+drop table t1,t2;
 # End of 4.1 tests