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

This wouldn't ever be pushed

Browse Source
This commit is contained in:
serg@serg.mysql.com 2001-04-08 12:56:12 +02:00
parent a6ebe74e3c
commit 28750d031a
2 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
mysql-test/t/handler.test
View File

@ -3,30 +3,47 @@
# #
drop table if exists t1; drop table if exists t1;
create table t1 (a int, b char(10), key a(a)); create table t1 (a int, b char(10), key a(a), key b(a,b));
insert into t1 values insert into t1 values
(14,"aaa"),(15,"bbb"),(16,"ccc"), (14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"),
(17,"ddd"),(18,"eee"),(19,"fff"), (17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"),
(20,"ggg"),(21,"hhh"),(22,"iii"); (20,"ggg"),(21,"hhh"),(22,"iii");
handler t1 open; handler t1 open as t2;
handler t1 read a first; handler t2 read a first;
handler t1 read a next; handler t2 read a next;
handler t1 read a next; handler t2 read a next;
handler t1 read a prev; handler t2 read a prev;
handler t1 read a last; handler t2 read a last;
handler t1 read a prev; handler t2 read a prev;
handler t1 read a prev; handler t2 read a prev;
handler t1 read a first; handler t2 read a first;
handler t1 read a prev; handler t2 read a prev;
handler t1 read a last; handler t2 read a last;
handler t1 read a prev; handler t2 read a prev;
handler t1 read a next; handler t2 read a next;
handler t1 read a next; handler t2 read a next;
handler t1 read a=(15); handler t2 read a=(15);
handler t2 read a=(16);
handler t1 close; !$1070 handler t2 read a=(19,"fff");
handler t2 read b=(19,"fff");
handler t2 read b=(19,"yyy");
handler t2 read b=(19);
!$1109 handler t1 read a last;
handler t2 read a=(11);
handler t2 read a>=(11);
handler t2 read a=(18);
handler t2 read a>=(18);
handler t2 read a>(18);
handler t2 read a<=(18);
handler t2 read a<(18);
handler t2 close;
drop table if exists t1; drop table if exists t1;

6
sql/sql_handler.cc
View File

@ -90,6 +90,12 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
KEY *keyinfo=table->key_info+keyno; KEY *keyinfo=table->key_info+keyno;
uint key_len=0, i; uint key_len=0, i;
byte *key, *buf; byte *key, *buf;
if (key_expr->elements > keyinfo->key_parts)
{
my_printf_error(ER_TOO_MANY_KEY_PARTS,ER(ER_TOO_MANY_KEY_PARTS),
MYF(0),keyinfo->key_parts);
return -1;
}
for (i=0; i < key_expr->elements; i++) for (i=0; i < key_expr->elements; i++)
key_len+=keyinfo->key_part[i].store_length; key_len+=keyinfo->key_part[i].store_length;
if (!(key=sql_calloc(ALIGN_SIZE(key_len)))) if (!(key=sql_calloc(ALIGN_SIZE(key_len))))