mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 14:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge bk-internal:/home/bk/mysql-4.0/

Browse source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


sql/sql_handler.cc:
  Auto merged
This commit is contained in:
unknown 2003-07-04 12:55:46 +02:00
commit b22a797631
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/handler.result
View file

@ -151,4 +151,6 @@ insert into t1 values (1), (2), (3);
handler t1 open;
handler t1 read a=(W);
Unknown column 'W' in 'field list'
handler t1 read a=(a);
Wrong arguments to HANDLER ... READ
drop table t1;

2
mysql-test/t/handler.test
View file

@ -88,5 +88,7 @@ insert into t1 values (1), (2), (3);
handler t1 open;
--error 1054
handler t1 read a=(W);
--error 1210
handler t1 read a=(a);
drop table t1;

5
sql/sql_handler.cc
View file

@ -195,6 +195,11 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
{
if (item->fix_fields(thd, tables))
goto err;
if (item->used_tables() & ~RAND_TABLE_BIT)
{
my_error(ER_WRONG_ARGUMENTS,MYF(0),"HANDLER ... READ");
goto err;
}
item->save_in_field(key_part->field, 1);
key_len+=key_part->store_length;
}