Commit 111b40e1 authored by unknown's avatar unknown
Browse files

Manually merged 


include/config-netware.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/select.result:
  Manually merged fix for bug#13855
mysql-test/t/select.test:
  Manuall merged fix for bug#13855
parents 4cccc642 a1d92b8a

mysql-test/r/select.result

+8 −0
Original line number Diff line number Diff line
@@ -2400,6 +2400,14 @@ id select_type table type possible_keys key key_len ref rows Extra 
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');

mysql-test/t/select.test

+9 −0
Original line number Diff line number Diff line
@@ -2228,4 +2228,13 @@ SELECT t2.a, t2.b, IF(t1.b IS NULL,'',c) AS c, COUNT(*) AS d FROM t2,t1 
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

netware/mysql_test_run.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ void report_stats() 
    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");

  }

sql/sql_select.cc

+1 −0
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ JOIN::optimize() 
  {

    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);