database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

Browse Source 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt


mysql-test/r/select.result:
  Manual merge
mysql-test/t/select.test:
  Manual merge
This commit is contained in:
unknown
2006-09-29 11:36:27 -07:00
parent d1da520f9b 1643d0c5ed
commit f66945aadb
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/select.result
View File

@ -3517,6 +3517,12 @@ id a b c d e
2 NULL NULL NULL 2 40 2 NULL NULL NULL 2 40
2 NULL NULL NULL 2 50 2 NULL NULL NULL 2 50
DROP TABLE t1,t2,t3; DROP TABLE t1,t2,t3;
create table t1 (c1 varchar(1), c2 int, c3 int, c4 int, c5 int, c6 int,
c7 int, c8 int, c9 int, fulltext key (`c1`));
select distinct match (`c1`) against ('z') , c2, c3, c4,c5, c6,c7, c8
from t1 where c9=1 order by c2, c2;
match (`c1`) against ('z') c2 c3 c4 c5 c6 c7 c8
drop table t1;
CREATE TABLE t1 (pk varchar(10) PRIMARY KEY, fk varchar(16)); CREATE TABLE t1 (pk varchar(10) PRIMARY KEY, fk varchar(16));
CREATE TABLE t2 (pk varchar(16) PRIMARY KEY, fk varchar(10)); CREATE TABLE t2 (pk varchar(16) PRIMARY KEY, fk varchar(10));
INSERT INTO t1 VALUES INSERT INTO t1 VALUES

8
mysql-test/t/select.test
View File

@ -2999,6 +2999,14 @@ SELECT * FROM t1 LEFT JOIN t2 ON t2.b=t1.a INNER JOIN t3 ON t3.d=t1.id
DROP TABLE t1,t2,t3; DROP TABLE t1,t2,t3;
# #
# Bug#20503: Server crash due to the ORDER clause isn't taken into account
# while space allocation
#
create table t1 (c1 varchar(1), c2 int, c3 int, c4 int, c5 int, c6 int,
c7 int, c8 int, c9 int, fulltext key (`c1`));
select distinct match (`c1`) against ('z') , c2, c3, c4,c5, c6,c7, c8
from t1 where c9=1 order by c2, c2;
drop table t1;
# Bug #22735: no equality propagation for BETWEEN and IN with STRING arguments # Bug #22735: no equality propagation for BETWEEN and IN with STRING arguments
# #

12
sql/sql_select.cc
View File

@ -13513,7 +13513,19 @@ bool JOIN::alloc_func_list()
disctinct->group_by optimization disctinct->group_by optimization
*/ */
if (select_distinct) if (select_distinct)
{
group_parts+= fields_list.elements; group_parts+= fields_list.elements;
/*
If the ORDER clause is specified then it's possible that
it also will be optimized, so reserve space for it too
*/
if (order)
{
ORDER *ord;
for (ord= order; ord; ord= ord->next)
group_parts++;
}
}
/* This must use calloc() as rollup_make_fields depends on this */ /* This must use calloc() as rollup_make_fields depends on this */
sum_funcs= (Item_sum**) thd->calloc(sizeof(Item_sum**) * (func_count+1) + sum_funcs= (Item_sum**) thd->calloc(sizeof(Item_sum**) * (func_count+1) +