diff options
| author | serg@serg.mysql.com <> | 2002-12-04 10:47:51 +0100 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2002-12-04 10:47:51 +0100 |
| commit | edb671e270cd6ddc8539cb560f4d06328548e3e0 (patch) | |
| tree | 6bec22f7f3d10ffb5c5d3e5bb561e306fb7a0c01 | |
| parent | 6dfd1d867e55dc8b77ea63ffc016b95fa7f23b95 (diff) | |
| download | mariadb-git-edb671e270cd6ddc8539cb560f4d06328548e3e0.tar.gz | |
post-merge fix
| -rw-r--r-- | myisam/mi_rnext_same.c | 5 | ||||
| -rw-r--r-- | mysql-test/r/group_by.result | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/myisam/mi_rnext_same.c b/myisam/mi_rnext_same.c index 662bdb154b3..a9d1953323c 100644 --- a/myisam/mi_rnext_same.c +++ b/myisam/mi_rnext_same.c @@ -27,14 +27,13 @@ int mi_rnext_same(MI_INFO *info, byte *buf) { int error; - uint inx,flag,not_used; + uint inx,not_used; MI_KEYDEF *keyinfo; DBUG_ENTER("mi_rnext_same"); if ((int) (inx=info->lastinx) < 0 || info->lastpos == HA_OFFSET_ERROR) DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX); keyinfo=info->s->keyinfo+inx; - flag=SEARCH_BIGGER; /* Read next */ if (fast_mi_readinfo(info)) DBUG_RETURN(my_errno); @@ -44,7 +43,7 @@ int mi_rnext_same(MI_INFO *info, byte *buf) for (;;) { if ((error=_mi_search_next(info,keyinfo,info->lastkey, - info->lastkey_length,flag, + info->lastkey_length,SEARCH_BIGGER, info->s->state.key_root[inx]))) break; if (_mi_key_cmp(keyinfo->seg,info->lastkey2,info->lastkey, diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index 0e8c6520d5c..ddddb3fa07d 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -205,6 +205,14 @@ Documentation 0 Host communication 0 kkkkkkkkkkk lllllllllll 3 Test Procedures 0 +select value,description,COUNT(bug_id) from t2 left join t1 on t2.program=t1.product and t2.value=t1.component where program="AAAAA" group by value having COUNT(bug_id) IN (0,2); +value description COUNT(bug_id) +BBBBBBBBBBBBB - conversion 2 +BBBBBBBBBBBBB - eeeeeeeee 0 +BBBBBBBBBBBBB - generic 2 +Documentation 0 +Host communication 0 +Test Procedures 0 drop table t1,t2; create table t1 (foo int); insert into t1 values (1); @@ -232,6 +240,13 @@ userid count(*) 3 3 2 1 1 2 +select userid,count(*) from t1 group by userid desc having (count(*)+1) IN (4,3); +userid count(*) +3 3 +1 2 +select userid,count(*) from t1 group by userid desc having 3 IN (1,COUNT(*)); +userid count(*) +3 3 explain select spid,count(*) from t1 where spid between 1 and 2 group by spid desc; table type possible_keys key key_len ref rows Extra t1 range spID spID 5 NULL 2 Using where; Using index |