1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mdk10.(none):/home/reggie/bk/mysql-4.1
This commit is contained in:
unknown 2005-04-01 08:18:49 -06:00
commit d1b9ce83f5
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/group_by.result
View File

@ -693,7 +693,7 @@ concat('val-', x3.a + 3*x4.a), -- 12
concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120 concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120
concat('val-', @a + 120*D.a) concat('val-', @a + 120*D.a)
from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4; from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4;
delete from t2 where a = 2 and b = 'val-2' limit 30; delete from t2 where a = 2 and b = 'val-2' order by a,b,c,d limit 30;
explain select c from t2 where a = 2 and b = 'val-2' group by c; explain select c from t2 where a = 2 and b = 'val-2' group by c;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ref PRIMARY,a PRIMARY 400 const,const 6 Using where 1 SIMPLE t2 ref PRIMARY,a PRIMARY 400 const,const 6 Using where

3
mysql-test/t/group_by.test
View File

@ -508,7 +508,8 @@ insert into t2 select
concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120 concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120
concat('val-', @a + 120*D.a) concat('val-', @a + 120*D.a)
from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4; from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4;
delete from t2 where a = 2 and b = 'val-2' limit 30;
delete from t2 where a = 2 and b = 'val-2' order by a,b,c,d limit 30;
explain select c from t2 where a = 2 and b = 'val-2' group by c; explain select c from t2 where a = 2 and b = 'val-2' group by c;
select c from t2 where a = 2 and b = 'val-2' group by c; select c from t2 where a = 2 and b = 'val-2' group by c;

3
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View File

@ -2227,8 +2227,9 @@ void Dbdict::checkSchemaStatus(Signal* signal)
restartCreateTab(signal, tableId, oldEntry, false); restartCreateTab(signal, tableId, oldEntry, false);
return; return;
}//if }//if
break;
} }
ndbrequire(ok);
break;
} }
case SchemaFile::DROP_TABLE_STARTED: case SchemaFile::DROP_TABLE_STARTED:
jam(); jam();

2
scripts/make_win_src_distribution.sh
View File

@ -251,7 +251,7 @@ copy_dir_dirs() {
for i in client dbug extra heap include isam \ for i in client dbug extra heap include isam \
libmysql libmysqld merge myisam \ libmysql libmysqld merge myisam \
myisammrg mysys regex sql strings sql-common \ myisammrg mysys regex sql strings sql-common sql/examples \
tools vio zlib tools vio zlib
do do
copy_dir_files $i copy_dir_files $i

5
sql/sql_select.cc
View File

@ -7179,8 +7179,9 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
/* /*
We'll use ref access method on key new_ref_key. In general case We'll use ref access method on key new_ref_key. In general case
the index search tuple for new_ref_key will be different (e.g. the index search tuple for new_ref_key will be different (e.g.
when one of the indexes only covers prefix of the field, see when one index is defined as (part1, part2, ...) and another as
BUG#9213 in group_by.test). (part1, part2(N), ...) and the WHERE clause contains
"part1 = const1 AND part2=const2".
So we build tab->ref from scratch here. So we build tab->ref from scratch here.
*/ */
KEYUSE *keyuse= tab->keyuse; KEYUSE *keyuse= tab->keyuse;