diff options
author | Michael Widenius <monty@askmonty.org> | 2011-01-12 15:41:39 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-01-12 15:41:39 +0200 |
commit | 213321206efb1ed9b13cae8ffa2d03eababe1c2d (patch) | |
tree | 03e14946bf70f205b42da51d55adb97511f54f06 /mysql-test/suite/handler/innodb.result | |
parent | 3e77b1dade6a93275479a93fba4272b59d366d65 (diff) | |
download | mariadb-git-213321206efb1ed9b13cae8ffa2d03eababe1c2d.tar.gz |
Fix for LP#697610 ha_index_prev(uchar*): Assertion `inited==INDEX' failed with HANDLER + InnoDB in maria-5.3
mysql-test/suite/handler/innodb.result:
Added test case
mysql-test/suite/handler/innodb.test:
Added test case
sql/handler.h:
Move setting/resetting of active_index to ha_index_init()/ha_index_end() to simplify handler functions index_init()/index_end()
Fixed that get_index() returns MAX_KEY if index is not inited (this fixed LP#697610)
storage/federated/ha_federated.cc:
Settting of active_index is not needed anymore
storage/maria/ma_pagecache.c:
Added error message if we have too little memory for Maria page cache
Diffstat (limited to 'mysql-test/suite/handler/innodb.result')
-rw-r--r-- | mysql-test/suite/handler/innodb.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/suite/handler/innodb.result b/mysql-test/suite/handler/innodb.result index 83ce270612d..2cdaa0c4664 100644 --- a/mysql-test/suite/handler/innodb.result +++ b/mysql-test/suite/handler/innodb.result @@ -560,3 +560,13 @@ HANDLER t1 READ a NEXT; a HANDLER t1 CLOSE; DROP TABLE t1; +CREATE TABLE t1 (f1 integer, f2 integer, primary key (f1), key (f2)) engine=innodb; +INSERT INTO t1 VALUES (1,1),(2,2),(3,3); +HANDLER t1 OPEN; +HANDLER t1 READ FIRST WHERE f2 <= 1; +f1 f2 +1 1 +HANDLER t1 READ `PRIMARY` PREV; +f1 f2 +3 3 +DROP TABLE t1; |