database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for a bug with InnoDB SQL handler, when previous query failed

Browse Source 
and an attempt is made to read previous / next value.
This commit is contained in:
unknown
2003-04-16 21:10:45 +03:00
parent 674d512da0
commit dad32c9310
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/innodb_handler.result
View File

@ -139,4 +139,12 @@ a b
alter table t1 type=innodb; alter table t1 type=innodb;
handler t2 read first; handler t2 read first;
Unknown table 't2' in HANDLER Unknown table 't2' in HANDLER
drop table if exists t1; drop table t1;
CREATE TABLE t1 ( no1 smallint(5) NOT NULL default '0', no2 int(10) NOT NULL default '0', PRIMARY KEY (no1,no2)) TYPE=InnoDB;
INSERT INTO t1 VALUES (1,274),(1,275),(2,6),(2,8),(4,1),(4,2);
HANDLER t1 OPEN;
HANDLER t1 READ `primary` = (1, 1000);
no1 no2
HANDLER t1 READ `primary` PREV;
no1 no2
DROP TABLE t1;

8
mysql-test/t/innodb_handler.test
View File

@ -72,5 +72,11 @@ alter table t1 type=innodb;
--error 1109 --error 1109
handler t2 read first; handler t2 read first;
drop table if exists t1; drop table t1;
CREATE TABLE t1 ( no1 smallint(5) NOT NULL default '0', no2 int(10) NOT NULL default '0', PRIMARY KEY (no1,no2)) TYPE=InnoDB;
INSERT INTO t1 VALUES (1,274),(1,275),(2,6),(2,8),(4,1),(4,2);
HANDLER t1 OPEN;
HANDLER t1 READ `primary` = (1, 1000);
HANDLER t1 READ `primary` PREV;
DROP TABLE t1;

3
sql/ha_innodb.cc
View File

@ -2579,6 +2579,9 @@ ha_innobase::general_fetch(
ut_a(prebuilt->trx == ut_a(prebuilt->trx ==
(trx_t*) current_thd->transaction.all.innobase_tid); (trx_t*) current_thd->transaction.all.innobase_tid);
if (table->status == STATUS_NOT_FOUND)
DBUG_RETURN(HA_ERR_KEY_NOT_FOUND);
srv_conc_enter_innodb(prebuilt->trx); srv_conc_enter_innodb(prebuilt->trx);
ret = row_search_for_mysql((byte*)buf, 0, prebuilt, match_mode, ret = row_search_for_mysql((byte*)buf, 0, prebuilt, match_mode,