diff options
| author | monty@mashka.mysql.fi <> | 2003-08-11 22:44:43 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-08-11 22:44:43 +0300 |
| commit | 2263e3e51faba531a0a7055dbf706a6a8719ad70 (patch) | |
| tree | 3c0ddcb446b8be099c3ab2616c459a573ee3cf92 /sql/sql_handler.cc | |
| parent | 1279f9b024614cf97cf447cfb10d6d7d69abb8bc (diff) | |
| parent | 6e7a509d06824447e427dd44d5692489267d9c4b (diff) | |
| download | mariadb-git-2263e3e51faba531a0a7055dbf706a6a8719ad70.tar.gz | |
Merge with 4.0.14
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 79d13039784..0387f02e83f 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -203,6 +203,13 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, Item *item; for (key_len=0 ; (item=it_ke++) ; key_part++) { + 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; + } (void) item->save_in_field(key_part->field, 1); key_len+=key_part->store_length; } @@ -237,7 +244,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, } if (cond && !cond->val_int()) continue; - if (!err && num_rows >= offset_limit) + if (num_rows >= offset_limit) { String *packet = &thd->packet; Item *item; |