Skip to content

M
mariadb
Commit 505c663a authored by Michael Widenius's avatar Michael Widenius
Browse files
Options

- Fixed that Aria works with HANDLER commands 

- Added test case for Aria
- Tested HANDLER with HEAP (changes to HEAP code will be pushed in 5.3)
- Moved all HANDLER test to suite/handler.


mysql-test/Makefile.am:
  Added suite/handler
mysql-test/mysql-test-run.pl:
  Added suite/handler
mysql-test/r/lock_multi.result:
  Remove test that is already in handler test suite
mysql-test/suite/handler/aria.result:
  Test for HANDLER with Aria storage engine
mysql-test/suite/handler/aria.test:
  Test for HANDLER with Aria storage engine
mysql-test/suite/handler/handler.inc:
  Extended the general handler test
  Moved interface testing to 'interface.test'
mysql-test/suite/handler/init.inc:
  Common init for handler tests.
mysql-test/suite/handler/innodb.result:
  New results
mysql-test/suite/handler/innodb.test:
  Update to use new include files
mysql-test/suite/handler/interface.result:
  Test of HANDLER interface (not storage engine dependent parts)
mysql-test/suite/handler/interface.test:
  Test of HANDLER interface (not storage engine dependent parts)
mysql-test/suite/handler/myisam.result:
  New results
mysql-test/suite/handler/myisam.test:
  Update to use new include files
mysql-test/t/lock_multi.test:
  Remove test that is already in handler test suite
mysys/tree.c:
  Added missing handling of read previous (showed up in HEAP testing)
sql/handler.cc:
  Don't marka 'HA_ERR_RECORD_CHANGED' as fatal (can be used with HANDLER READ, especially with MEMORY ENGINE)
sql/handler.h:
  Added prototype for can_continue_handler_scan()
sql/sql_handler.cc:
  Re-initialize search if we switch from key to table search.
  Check if handler can continue searching between calls (via can_continue_handler_scan())
  Don't write common not fatal errors to log
storage/maria/ma_extra.c:
  Don't set index 0 as default. This forces call to ma_check_index() to set up index variables.
storage/maria/ma_ft_boolean_search.c:
  Ensure that info->last_key.keyinfo is set
storage/maria/ma_open.c:
  Don't set index 0 as default. This forces call to ma_check_index() to set up index variables.
storage/maria/ma_rkey.c:
  Trivial optimization
storage/maria/ma_rnext.c:
  Added missing code from mi_rnext.c to ensure that handler next/prev works.
storage/maria/ma_rsame.c:
  Simple optimizations
storage/maria/ma_search.c:
  Initialize info->last_key once and for all when we change keys.
storage/maria/ma_unique.c:
  Ensure that info->last_key.keyinfo is up to date.
parent c0fc6d42
Hide whitespace changes
Inline Side-by-side
Showing with 1664 additions and 964 deletions
mysql-test/Makefile.am
View file @ 505c663a
...@@ -106,7 +106,7 @@ TEST_DIRS = t r include std_data std_data/parts collections \ ...@@ -106,7 +106,7 @@ TEST_DIRS = t r include std_data std_data/parts collections \
suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include \ suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include \
suite/innodb_plugin suite/innodb_plugin/t suite/innodb_plugin/r \ suite/innodb_plugin suite/innodb_plugin/t suite/innodb_plugin/r \
suite/innodb_plugin/include \ suite/innodb_plugin/include \
suite/percona \ suite/percona suite/handler \
suite/engines suite/engines/funcs suite/engines/iuds suite/engines/rr_trx \ suite/engines suite/engines/funcs suite/engines/iuds suite/engines/rr_trx \
suite/engines/funcs/r suite/engines/funcs/t suite/engines/iuds/r \ suite/engines/funcs/r suite/engines/funcs/t suite/engines/iuds/r \
suite/engines/iuds/t suite/engines/rr_trx/include suite/engines/rr_trx/r \ suite/engines/iuds/t suite/engines/rr_trx/include suite/engines/rr_trx/r \
......
mysql-test/mysql-test-run.pl
View file @ 505c663a
...@@ -142,7 +142,7 @@ my $path_config_file; # The generated config file, var/my.cnf ...@@ -142,7 +142,7 @@ my $path_config_file; # The generated config file, var/my.cnf
# executables will be used by the test suite. # executables will be used by the test suite.
our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
my $DEFAULT_SUITES= "main,binlog,federated,rpl,maria,parts,innodb,innodb_plugin,percona,ndb"; my $DEFAULT_SUITES= "main,binlog,federated,rpl,maria,handler,parts,innodb,innodb_plugin,percona,ndb";
my $opt_suites; my $opt_suites;
our $opt_verbose= 0; # Verbose output, enable with --verbose our $opt_verbose= 0; # Verbose output, enable with --verbose
......
mysql-test/r/lock_multi.result
View file @ 505c663a
...@@ -162,13 +162,6 @@ ERROR 70100: Query execution was interrupted ...@@ -162,13 +162,6 @@ ERROR 70100: Query execution was interrupted
unlock tables; unlock tables;
drop table t1; drop table t1;
drop table if exists t1; drop table if exists t1;
create table t1 (a int) ENGINE=MEMORY;
--> client 2
handler t1 open;
ERROR HY000: Table storage engine for 't1' doesn't have this option
--> client 1
drop table t1;
drop table if exists t1;
create table t1 (i int); create table t1 (i int);
connection: default connection: default
lock tables t1 write; lock tables t1 write;
......
mysql-test/suite/handler/aria.result 0 → 100644
View file @ 505c663a
SET SESSION STORAGE_ENGINE = Aria;
drop table if exists t1,t3,t4,t5;
create table t1 (a int, b char(10), key a (a), key b (a,b));
insert into t1 values
(17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"),
(14,"aaa"),(16,"ccc"),(16,"xxx"),
(20,"ggg"),(21,"hhh"),(22,"iii");
handler t1 open as t2;
handler t2 read a first;
a b
14 aaa
handler t2 read a next;
a b
16 ccc
handler t2 read a next;
a b
16 xxx
handler t2 read a prev;
a b
16 ccc
handler t2 read a last;
a b
22 iii
handler t2 read a prev;
a b
21 hhh
handler t2 read a prev;
a b
20 ggg
handler t2 read a first;
a b
14 aaa
handler t2 read a prev;
a b
handler t2 read a last;
a b
22 iii
handler t2 read a prev;
a b
21 hhh
handler t2 read a next;
a b
22 iii
handler t2 read a next;
a b
handler t2 read a=(15);
a b
handler t2 read a=(16);
a b
16 ccc
handler t2 read a=(19,"fff");
ERROR 42000: Too many key parts specified; max 1 parts allowed
handler t2 read b=(19,"fff");
a b
19 fff
handler t2 read b=(19,"yyy");
a b
19 yyy
handler t2 read b=(19);
a b
19 fff
handler t1 read a last;
ERROR 42S02: Unknown table 't1' in HANDLER
handler t2 read a=(11);
a b
handler t2 read a>=(11);
a b
14 aaa
handler t2 read a=(18);
a b
18 eee
handler t2 read a>=(18);
a b
18 eee
handler t2 read a>(18);
a b
19 fff
handler t2 read a<=(18);
a b
18 eee
handler t2 read a<(18);
a b
17 ddd
handler t2 read a=(15);
a b
handler t2 read a>=(15);
a b
16 ccc
handler t2 read a>(15);
a b
16 ccc
handler t2 read a<=(15);
a b
14 aaa
handler t2 read a<(15);
a b
14 aaa
handler t2 read a=(54);
a b
handler t2 read a>=(54);
a b
handler t2 read a>(54);
a b
handler t2 read a<=(54);
a b
22 iii
handler t2 read a<(54);
a b
22 iii
handler t2 read a=(1);
a b
handler t2 read a>=(1);
a b
14 aaa
handler t2 read a>(1);
a b
14 aaa
handler t2 read a<=(1);
a b
handler t2 read a<(1);
a b
handler t2 read a first limit 5;
a b
14 aaa
16 ccc
16 xxx
17 ddd
18 eee
handler t2 read a next limit 3;
a b
19 fff
19 yyy
20 ggg
handler t2 read a prev limit 10;
a b
19 yyy
19 fff
18 eee
17 ddd
16 xxx
16 ccc
14 aaa
handler t2 read a>=(16) limit 4;
a b
16 ccc
16 xxx
17 ddd
18 eee
handler t2 read a>=(16) limit 2,2;
a b
17 ddd
18 eee
handler t2 read a last limit 3;
a b
22 iii
21 hhh
20 ggg
handler t2 read a=(19);
a b
19 fff
handler t2 read a=(19) where b="yyy";
a b
19 yyy
handler t2 read first;
a b
17 ddd
handler t2 read next;
a b
18 eee
handler t2 read next;
a b
19 fff
handler t2 close;
handler t1 open;
handler t1 read a next;
a b
14 aaa
handler t1 read a next;
a b
16 ccc
handler t1 close;
handler t1 open;
handler t1 read a prev;
a b
22 iii
handler t1 read a prev;
a b
21 hhh
handler t1 close;
handler t1 open as t2;
handler t2 read first;
a b
17 ddd
alter table t1 engine = Aria;
handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER
handler t1 open as t2;
drop table t1;
create table t1 (a int not null);
insert into t1 values (17);
handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER
handler t1 open as t2;
alter table t1 engine=CSV;
handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER
drop table t1;
create table t1 (a int);
insert into t1 values (1),(2),(3),(4),(5),(6);
delete from t1 limit 2;
handler t1 open;
handler t1 read first;
a
3
handler t1 read first limit 1,1;
a
4
handler t1 read first limit 2,2;
a
5
6
delete from t1 limit 3;
handler t1 read first;
a
6
drop table t1;
create table t1(a int, index (a));
insert into t1 values (1), (2), (3);
handler t1 open;
handler t1 read a=(W);
ERROR 42S22: Unknown column 'W' in 'field list'
handler t1 read a=(a);
ERROR HY000: Incorrect arguments to HANDLER ... READ
drop table t1;
create table t1 (a char(5));
insert into t1 values ("Ok");
handler t1 open as t;
handler t read first;
a
Ok
use mysql;
handler t read first;
a
Ok
handler t close;
handler test.t1 open as t;
handler t read first;
a
Ok
handler t close;
use test;
drop table t1;
create table t1 ( a int, b int, INDEX a (a) );
insert into t1 values (1,2), (2,1);
handler t1 open;
handler t1 read a=(1) where b=2;
a b
1 2
handler t1 read a=(1) where b=3;
a b
handler t1 read a=(1) where b=1;
a b
handler t1 close;
drop table t1;
create table t1 (c1 char(20));
insert into t1 values ("t1");
handler t1 open as h1;
handler h1 read first limit 9;
c1
t1
create table t2 (c1 char(20));
insert into t2 values ("t2");
handler t2 open as h2;
handler h2 read first limit 9;
c1
t2
create table t3 (c1 char(20));
insert into t3 values ("t3");
handler t3 open as h3;
handler h3 read first limit 9;
c1
t3
create table t4 (c1 char(20));
insert into t4 values ("t4");
handler t4 open as h4;
handler h4 read first limit 9;
c1
t4
create table t5 (c1 char(20));
insert into t5 values ("t5");
handler t5 open as h5;
handler h5 read first limit 9;
c1
t5
alter table t1 engine=MyISAM;
handler h1 read first limit 9;
ERROR 42S02: Unknown table 'h1' in HANDLER
handler h2 read first limit 9;
c1
t2
handler h3 read first limit 9;
c1
t3
handler h4 read first limit 9;
c1
t4
handler h5 read first limit 9;
c1
t5
alter table t5 engine=MyISAM;
handler h1 read first limit 9;
ERROR 42S02: Unknown table 'h1' in HANDLER
handler h2 read first limit 9;
c1
t2
handler h3 read first limit 9;
c1
t3
handler h4 read first limit 9;
c1
t4
handler h5 read first limit 9;
ERROR 42S02: Unknown table 'h5' in HANDLER
alter table t3 engine=MyISAM;
handler h1 read first limit 9;
ERROR 42S02: Unknown table 'h1' in HANDLER
handler h2 read first limit 9;
c1
t2
handler h3 read first limit 9;
ERROR 42S02: Unknown table 'h3' in HANDLER
handler h4 read first limit 9;
c1
t4
handler h5 read first limit 9;
ERROR 42S02: Unknown table 'h5' in HANDLER
handler h2 close;
handler h4 close;
handler t1 open as h1_1;
handler t1 open as h1_2;
handler t1 open as h1_3;
handler h1_1 read first limit 9;
c1
t1
handler h1_2 read first limit 9;
c1
t1
handler h1_3 read first limit 9;
c1
t1
alter table t1 engine=Aria;
handler h1_1 read first limit 9;
ERROR 42S02: Unknown table 'h1_1' in HANDLER
handler h1_2 read first limit 9;
ERROR 42S02: Unknown table 'h1_2' in HANDLER
handler h1_3 read first limit 9;
ERROR 42S02: Unknown table 'h1_3' in HANDLER
drop table t1;
drop table t2;
drop table t3;
drop table t4;
drop table t5;
create table t1 (c1 int);
insert into t1 values (1);
handler t1 open;
handler t1 read first;
c1
1
send the below to another connection, do not wait for the result
optimize table t1;
proceed with the normal connection
handler t1 read next;
c1
1
handler t1 close;
read the result from the other connection
Table Op Msg_type Msg_text
test.t1 optimize status OK
proceed with the normal connection
drop table t1;
CREATE TABLE t1 ( no1 smallint(5) NOT NULL default '0', no2 int(10) NOT NULL default '0', PRIMARY KEY (no1,no2));
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
1 275
HANDLER t1 READ `primary` = (1, 1000);
no1 no2
HANDLER t1 READ `primary` NEXT;
no1 no2
2 6
DROP TABLE t1;
create table t1 (c1 int);
insert into t1 values (14397);
flush tables with read lock;
drop table t1;
ERROR HY000: Can't execute the query because you have a conflicting read lock
send the below to another connection, do not wait for the result
drop table t1;
proceed with the normal connection
select * from t1;
c1
14397
unlock tables;
read the result from the other connection
proceed with the normal connection
select * from t1;
ERROR 42S02: Table 'test.t1' doesn't exist
drop table if exists t1;
Warnings:
Note 1051 Unknown table 't1'
create table t1 (a int not null) ENGINE=CSV;
--> client 2
handler t1 open;
ERROR HY000: Table storage engine for 't1' doesn't have this option
--> client 1
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias read a next;
ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
handler t1_alias READ a next where inexistent > 0;
ERROR 42S22: Unknown column 'inexistent' in 'field list'
handler t1_alias read a next;
ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
handler t1_alias READ a next where inexistent > 0;
ERROR 42S22: Unknown column 'inexistent' in 'field list'
handler t1_alias close;
drop table t1;
create temporary table t1 (a int, b char(1), key a (a), key b(a,b));
insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"),
(5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j"),(9,'k');
select a,b from t1;
a b
0 a
1 b
2 c
3 d
4 e
5 f
6 g
7 h
8 i
9 j
9 k
handler t1 open as a1;
handler a1 read a=(1);
a b
1 b
handler a1 read a next;
a b
2 c
handler a1 read a next;
a b
3 d
select a,b from t1;
ERROR HY000: Can't reopen table: 'a1'
handler a1 read a prev;
a b
2 c
handler a1 read a prev;
a b
1 b
handler a1 read a=(6) where b="g";
a b
6 g
handler a1 close;
select a,b from t1;
a b
0 a
1 b
2 c
3 d
4 e
5 f
6 g
7 h
8 i
9 j
9 k
handler t1 open as a2;
handler a2 read a=(9);
a b
9 j
handler a2 read a next;
a b
9 k
handler a2 read a prev limit 2;
a b
9 j
8 i
handler a2 read a last;
a b
9 k
handler a2 read a prev;
a b
9 j
handler a2 close;
drop table t1;
create table t1 (a int);
create temporary table t2 (a int, key (a));
handler t1 open as a1;
handler t2 open as a2;
handler a2 read a first;
a
drop table t1, t2;
handler a2 read a next;
ERROR 42S02: Unknown table 'a2' in HANDLER
handler a1 close;
ERROR 42S02: Unknown table 'a1' in HANDLER
create table t1 (a int, key (a));
create table t2 like t1;
handler t1 open as a1;
handler t2 open as a2;
handler a1 read a first;
a
handler a2 read a first;
a
alter table t1 add b int;
handler a1 close;
ERROR 42S02: Unknown table 'a1' in HANDLER
handler a2 close;
drop table t1, t2;
create table t1 (a int, key (a));
handler t1 open as a1;
handler a1 read a first;
a
rename table t1 to t2;
handler a1 read a first;
ERROR 42S02: Unknown table 'a1' in HANDLER
drop table t2;
create table t1 (a int, key (a));
create table t2 like t1;
handler t1 open as a1;
handler t2 open as a2;
handler a1 read a first;
a
handler a2 read a first;
a
optimize table t1;
Table Op Msg_type Msg_text
test.t1 optimize status Table is already up to date
handler a1 close;
ERROR 42S02: Unknown table 'a1' in HANDLER
handler a2 close;
drop table t1, t2;
#
# BUG#51877 - HANDLER interface causes invalid memory read
#
CREATE TABLE t1(a INT, KEY (a));
HANDLER t1 OPEN;
HANDLER t1 READ a FIRST;
a
INSERT INTO t1 VALUES(1);
HANDLER t1 READ a NEXT;
a
1
HANDLER t1 CLOSE;
DROP TABLE t1;
#
# BUG #46456: HANDLER OPEN + TRUNCATE + DROP (temporary) TABLE, crash
#
CREATE TABLE t1 AS SELECT 1 AS f1;
HANDLER t1 OPEN;
TRUNCATE t1;
HANDLER t1 READ FIRST;
ERROR 42S02: Unknown table 't1' in HANDLER
DROP TABLE t1;
CREATE TEMPORARY TABLE t1 AS SELECT 1 AS f1;
HANDLER t1 OPEN;
TRUNCATE t1;
HANDLER t1 READ FIRST;
ERROR 42S02: Unknown table 't1' in HANDLER
DROP TABLE t1;
#
# Bug #54007: assert in ha_myisam::index_next , HANDLER
#
CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a), KEY b(b), KEY ab(a, b));
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
a b
HANDLER t1 READ `PRIMARY` NEXT;
a b
HANDLER t1 READ ab NEXT;
a b
HANDLER t1 READ b NEXT;
a b
HANDLER t1 READ NEXT;
a b
HANDLER t1 CLOSE;
INSERT INTO t1 VALUES (2, 20), (1, 10), (4, 40), (3, 30);
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
a b
2 20
HANDLER t1 READ NEXT;
a b
1 10
HANDLER t1 READ `PRIMARY` NEXT;
a b
1 10
HANDLER t1 READ `PRIMARY` NEXT;
a b
2 20
HANDLER t1 READ ab NEXT;
a b
1 10
HANDLER t1 READ ab NEXT;
a b
2 20
HANDLER t1 READ b NEXT;
a b
1 10
HANDLER t1 READ b NEXT;
a b
2 20
HANDLER t1 READ b NEXT;
a b
3 30
HANDLER t1 READ b NEXT;
a b
4 40
HANDLER t1 READ b NEXT;
a b
HANDLER t1 READ NEXT;
a b
2 20
HANDLER t1 READ NEXT;
a b
1 10
HANDLER t1 READ NEXT;
a b
4 40
HANDLER t1 CLOSE;
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
a b
2 20
HANDLER t1 READ `PRIMARY` PREV;
a b
4 40
HANDLER t1 READ `PRIMARY` PREV;
a b
3 30
HANDLER t1 READ b PREV;
a b
4 40
HANDLER t1 READ b PREV;
a b
3 30
HANDLER t1 CLOSE;
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
a b
2 20
HANDLER t1 READ `PRIMARY` PREV LIMIT 3;
a b
4 40
3 30
2 20
HANDLER t1 READ b NEXT LIMIT 5;
a b
1 10
2 20
3 30
4 40
HANDLER t1 CLOSE;
DROP TABLE t1;
End of 5.1 tests
mysql-test/suite/handler/aria.test 0 → 100644
View file @ 505c663a
# t/handler_innodb.test
#
# test of HANDLER ...
#
# Last update:
# 2006-07-31 ML test refactored (MySQL 5.1)
# code of t/handler.test and t/innodb_handler.test united
# main testing code put into handler.inc
# rename t/innodb_handler.test to t/handler_innodb.test
#
--source include/have_maria.inc
let $engine_type= Aria;
--source init.inc
--source handler.inc
--echo #
--echo # BUG #46456: HANDLER OPEN + TRUNCATE + DROP (temporary) TABLE, crash
--echo #
CREATE TABLE t1 AS SELECT 1 AS f1;
HANDLER t1 OPEN;
TRUNCATE t1;
--error ER_UNKNOWN_TABLE
HANDLER t1 READ FIRST;
DROP TABLE t1;
CREATE TEMPORARY TABLE t1 AS SELECT 1 AS f1;
HANDLER t1 OPEN;
TRUNCATE t1;
--error ER_UNKNOWN_TABLE
HANDLER t1 READ FIRST;
DROP TABLE t1;
--echo #
--echo # Bug #54007: assert in ha_myisam::index_next , HANDLER
--echo #
CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a), KEY b(b), KEY ab(a, b));
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
HANDLER t1 READ `PRIMARY` NEXT;
HANDLER t1 READ ab NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ NEXT;
HANDLER t1 CLOSE;
INSERT INTO t1 VALUES (2, 20), (1, 10), (4, 40), (3, 30);
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
HANDLER t1 READ NEXT;
HANDLER t1 READ `PRIMARY` NEXT;
HANDLER t1 READ `PRIMARY` NEXT;
HANDLER t1 READ ab NEXT;
HANDLER t1 READ ab NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ NEXT;
HANDLER t1 READ NEXT;
HANDLER t1 READ NEXT;
HANDLER t1 CLOSE;
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
HANDLER t1 READ `PRIMARY` PREV;
HANDLER t1 READ `PRIMARY` PREV;
HANDLER t1 READ b PREV;
HANDLER t1 READ b PREV;
HANDLER t1 CLOSE;
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
HANDLER t1 READ `PRIMARY` PREV LIMIT 3;
HANDLER t1 READ b NEXT LIMIT 5;
HANDLER t1 CLOSE;
DROP TABLE t1;
--echo End of 5.1 tests
mysql-test/include/handler.inc → mysql-test/suite/handler/handler.inc
View file @ 505c663a
# include/handler.inc # handler.inc
# #
# See init.inc for setup of variables for this script
#
# The variables # The variables
# $engine_type -- storage engine to be tested # $engine_type -- storage engine to be tested
# $other_engine_type -- storage engine <> $engine_type # $other_engine_type -- storage engine <> $engine_type
...@@ -8,31 +10,19 @@ ...@@ -8,31 +10,19 @@
# 2. $other_handler_engine_type must point to an all # 2. $other_handler_engine_type must point to an all
# time available storage engine # time available storage engine
# 2006-08 MySQL 5.1 MyISAM and MEMORY only # 2006-08 MySQL 5.1 MyISAM and MEMORY only
# have to be set before sourcing this script.
-- source include/not_embedded.inc
# #
# test of HANDLER ... # test of HANDLER ...
# #
# Last update: # Last update:
# 2006-07-31 ML test refactored (MySQL 5.1) # 2006-07-31 ML test refactored (MySQL 5.1)
# code of t/handler.test and t/innodb_handler.test united # code of t/handler.test and t/innodb_handler.test united
# main testing code put into include/handler.inc # main testing code put into handler.inc
# #
eval SET SESSION STORAGE_ENGINE = $engine_type; #
# Start testing the table created in init.inc
--disable_warnings #
drop table if exists t1,t3,t4,t5;
--enable_warnings
create table t1 (a int, b char(10), key a(a), key b(a,b));
insert into t1 values
(17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"),
(14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"),
(20,"ggg"),(21,"hhh"),(22,"iii");
handler t1 open as t2; handler t1 open as t2;
-- error 1064
handler t2 read a=(SELECT 1);
handler t2 read a first; handler t2 read a first;
handler t2 read a next; handler t2 read a next;
handler t2 read a next; handler t2 read a next;
...@@ -65,12 +55,34 @@ handler t1 read a last; ...@@ -65,12 +55,34 @@ handler t1 read a last;
handler t2 read a=(11); handler t2 read a=(11);
handler t2 read a>=(11); handler t2 read a>=(11);
# Search on something we ca nfind
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 read a>(18);
handler t2 read a<=(18); handler t2 read a<=(18);
handler t2 read a<(18); handler t2 read a<(18);
# Search on something we can't find
handler t2 read a=(15);
handler t2 read a>=(15);
handler t2 read a>(15);
handler t2 read a<=(15);
handler t2 read a<(15);
# Search from upper end
handler t2 read a=(54);
handler t2 read a>=(54);
handler t2 read a>(54);
handler t2 read a<=(54);
handler t2 read a<(54);
# Search from lower end
handler t2 read a=(1);
handler t2 read a>=(1);
handler t2 read a>(1);
handler t2 read a<=(1);
handler t2 read a<(1);
handler t2 read a first limit 5; handler t2 read a first limit 5;
handler t2 read a next limit 3; handler t2 read a next limit 3;
handler t2 read a prev limit 10; handler t2 read a prev limit 10;
...@@ -85,8 +97,6 @@ handler t2 read a=(19) where b="yyy"; ...@@ -85,8 +97,6 @@ handler t2 read a=(19) where b="yyy";
handler t2 read first; handler t2 read first;
handler t2 read next; handler t2 read next;
handler t2 read next; handler t2 read next;
--error 1064
handler t2 read last;
handler t2 close; handler t2 close;
handler t1 open; handler t1 open;
...@@ -110,7 +120,7 @@ handler t2 read first; ...@@ -110,7 +120,7 @@ handler t2 read first;
# #
handler t1 open as t2; handler t1 open as t2;
drop table t1; drop table t1;
create table t1 (a int); create table t1 (a int not null);
insert into t1 values (17); insert into t1 values (17);
--error 1109 --error 1109
handler t2 read first; handler t2 read first;
...@@ -137,7 +147,7 @@ drop table t1; ...@@ -137,7 +147,7 @@ drop table t1;
# #
# Test for #751 # Test for #751
# #
create table t1(a int, index(a)); eval create table t1(a int, index $key_type (a));
insert into t1 values (1), (2), (3); insert into t1 values (1), (2), (3);
handler t1 open; handler t1 open;
--error 1054 --error 1054
...@@ -164,7 +174,7 @@ drop table t1; ...@@ -164,7 +174,7 @@ drop table t1;
# #
# BUG#3649 # BUG#3649
# #
create table t1 ( a int, b int, INDEX a (a) ); eval create table t1 ( a int, b int, INDEX a $key_type (a) );
insert into t1 values (1,2), (2,1); insert into t1 values (1,2), (2,1);
handler t1 open; handler t1 open;
handler t1 read a=(1) where b=2; handler t1 read a=(1) where b=2;
...@@ -173,143 +183,6 @@ handler t1 read a=(1) where b=1; ...@@ -173,143 +183,6 @@ handler t1 read a=(1) where b=1;
handler t1 close; handler t1 close;
drop table t1; drop table t1;
#
# Check if two database names beginning the same are seen as different.
#
# This database begins like the usual 'test' database.
#
--disable_warnings
drop database if exists test_test;
--enable_warnings
create database test_test;
use test_test;
create table t1(table_id char(20) primary key);
insert into t1 values ('test_test.t1');
insert into t1 values ('');
handler t1 open;
handler t1 read first limit 9;
create table t2(table_id char(20) primary key);
insert into t2 values ('test_test.t2');
insert into t2 values ('');
handler t2 open;
handler t2 read first limit 9;
#
# This is the usual 'test' database.
#
use test;
--disable_warnings
drop table if exists t1;
--enable_warnings
create table t1(table_id char(20) primary key);
insert into t1 values ('test.t1');
insert into t1 values ('');
--error 1066
handler t1 open;
#
# Check accesibility of all the tables.
#
use test;
--error 1064
handler test.t1 read first limit 9;
--error 1064
handler test_test.t1 read first limit 9;
handler t1 read first limit 9;
--error 1064
handler test_test.t2 read first limit 9;
handler t2 read first limit 9;
#
# Cleanup.
#
--error 1064
handler test_test.t1 close;
handler t1 close;
drop table test_test.t1;
--error 1064
handler test_test.t2 close;
handler t2 close;
drop table test_test.t2;
drop database test_test;
#
use test;
--error 1064
handler test.t1 close;
--error 1109
handler t1 close;
drop table test.t1;
#
# BUG#4335
#
--disable_warnings
drop database if exists test_test;
drop table if exists t1;
drop table if exists t2;
drop table if exists t3;
--enable_warnings
create database test_test;
use test_test;
create table t1 (c1 char(20));
insert into t1 values ('test_test.t1');
create table t3 (c1 char(20));
insert into t3 values ('test_test.t3');
handler t1 open;
handler t1 read first limit 9;
handler t1 open h1;
handler h1 read first limit 9;
use test;
create table t1 (c1 char(20));
create table t2 (c1 char(20));
create table t3 (c1 char(20));
insert into t1 values ('t1');
insert into t2 values ('t2');
insert into t3 values ('t3');
--error 1066
handler t1 open;
--error 1066
handler t2 open t1;
--error 1066
handler t3 open t1;
handler t1 read first limit 9;
--error 1064
handler test.t1 close;
--error 1066
handler test.t1 open h1;
--error 1066
handler test_test.t1 open h1;
handler test_test.t3 open h3;
handler test.t1 open h2;
handler t1 read first limit 9;
handler h1 read first limit 9;
handler h2 read first limit 9;
handler h3 read first limit 9;
handler h2 read first limit 9;
--error 1064
handler test.h1 close;
handler t1 close;
handler h1 close;
handler h2 close;
--error 1109
handler t1 read first limit 9;
--error 1109
handler h1 read first limit 9;
--error 1109
handler h2 read first limit 9;
handler h3 read first limit 9;
handler h3 read first limit 9;
use test_test;
handler h3 read first limit 9;
--error 1064
handler test.h3 read first limit 9;
handler h3 close;
use test;
drop table t3;
drop table t2;
drop table t1;
drop database test_test;
# #
# Test if fix for BUG#4286 correctly closes handler tables. # Test if fix for BUG#4286 correctly closes handler tables.
# #
...@@ -410,11 +283,13 @@ reap; ...@@ -410,11 +283,13 @@ reap;
connection default; connection default;
drop table 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)); eval CREATE TABLE t1 ( no1 smallint(5) NOT NULL default '0', no2 int(10) NOT NULL default '0', PRIMARY KEY $key_type (no1,no2));
INSERT INTO t1 VALUES (1,274),(1,275),(2,6),(2,8),(4,1),(4,2); INSERT INTO t1 VALUES (1,274),(1,275),(2,6),(2,8),(4,1),(4,2);
HANDLER t1 OPEN; HANDLER t1 OPEN;
HANDLER t1 READ `primary` = (1, 1000); HANDLER t1 READ `primary` = (1, 1000);
HANDLER t1 READ `primary` PREV; HANDLER t1 READ `primary` PREV;
HANDLER t1 READ `primary` = (1, 1000);
HANDLER t1 READ `primary` NEXT;
DROP TABLE t1; DROP TABLE t1;
# End of 4.1 tests # End of 4.1 tests
...@@ -468,10 +343,7 @@ drop table if exists t1; ...@@ -468,10 +343,7 @@ drop table if exists t1;
# #
# Bug#25856 - HANDLER table OPEN in one connection lock DROP TABLE in another one # Bug#25856 - HANDLER table OPEN in one connection lock DROP TABLE in another one
# #
--disable_warnings eval create table t1 (a int not null) ENGINE=$other_engine_type;
drop table if exists t1;
--enable_warnings
eval create table t1 (a int) ENGINE=$other_engine_type;
--echo --> client 2 --echo --> client 2
connection con2; connection con2;
--error 1031 --error 1031
...@@ -484,9 +356,6 @@ disconnect con2; ...@@ -484,9 +356,6 @@ disconnect con2;
# #
# Bug#30632 HANDLER read failure causes hang # Bug#30632 HANDLER read failure causes hang
# #
--disable_warnings
drop table if exists t1;
--enable_warnings
create table t1 (a int); create table t1 (a int);
handler t1 open as t1_alias; handler t1 open as t1_alias;
--error 1176 --error 1176
...@@ -500,74 +369,6 @@ handler t1_alias READ a next where inexistent > 0; ...@@ -500,74 +369,6 @@ handler t1_alias READ a next where inexistent > 0;
handler t1_alias close; handler t1_alias close;
drop table t1; drop table t1;
#
# Bug#21587 FLUSH TABLES causes server crash when used with HANDLER statements
#
--disable_warnings
drop table if exists t1,t2;
--enable_warnings
create table t1 (c1 int);
create table t2 (c1 int);
insert into t1 values (1);
insert into t2 values (2);
--echo connection: default
handler t1 open;
handler t1 read first;
connect (flush,localhost,root,,);
connection flush;
--echo connection: flush
--send flush tables;
connection default;
--echo connection: default
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Flushing tables";
--source include/wait_condition.inc
handler t2 open;
handler t2 read first;
handler t1 read next;
handler t1 close;
handler t2 close;
connection flush;
reap;
connection default;
drop table t1,t2;
disconnect flush;
#
# Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements
#
--disable_warnings
drop table if exists t1,t2;
--enable_warnings
create table t1 (c1 int);
--echo connection: default
handler t1 open;
handler t1 read first;
connect (flush,localhost,root,,);
connection flush;
--echo connection: flush
--send rename table t1 to t2;
connection default;
--echo connection: default
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table" and info = "rename table t1 to t2";
--source include/wait_condition.inc
handler t2 open;
handler t2 read first;
--error ER_NO_SUCH_TABLE
handler t1 read next;
handler t1 close;
handler t2 close;
connection flush;
reap;
connection default;
drop table t2;
disconnect flush;
# #
# Bug#30882 Dropping a temporary table inside a stored function may cause a server crash # Bug#30882 Dropping a temporary table inside a stored function may cause a server crash
# #
...@@ -575,15 +376,12 @@ disconnect flush; ...@@ -575,15 +376,12 @@ disconnect flush;
# is open by a HANDLER, no other statement can access it. # is open by a HANDLER, no other statement can access it.
# #
--disable_warnings eval create temporary table t1 (a int, b char(1), key a $key_type (a), key b(a,b));
drop table if exists t1;
--enable_warnings
create temporary table t1 (a int, b char(1), key a(a), key b(a,b));
insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"), insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"),
(5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j"); (5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j"),(9,'k');
select a,b from t1; select a,b from t1;
handler t1 open as a1; handler t1 open as a1;
handler a1 read a first; handler a1 read a=(1);
handler a1 read a next; handler a1 read a next;
handler a1 read a next; handler a1 read a next;
--error ER_CANT_REOPEN_TABLE --error ER_CANT_REOPEN_TABLE
...@@ -594,41 +392,19 @@ handler a1 read a=(6) where b="g"; ...@@ -594,41 +392,19 @@ handler a1 read a=(6) where b="g";
handler a1 close; handler a1 close;
select a,b from t1; select a,b from t1;
handler t1 open as a2; handler t1 open as a2;
handler a2 read a first; handler a2 read a=(9);
handler a2 read a next;
handler a2 read a prev limit 2;
--error 0,1031
handler a2 read a last; handler a2 read a last;
handler a2 read a prev; handler a2 read a prev;
handler a2 close; handler a2 close;
drop table t1; drop table t1;
#
# Bug#31397 Inconsistent drop table behavior of handler tables.
#
--disable_warnings
drop table if exists t1,t2;
--enable_warnings
create table t1 (a int);
handler t1 open as t1_alias;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
flush tables;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias close;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias read first;
drop table t1;
--error ER_UNKNOWN_TABLE
handler t1_alias read next;
# Test that temporary tables associated with handlers are properly dropped. # Test that temporary tables associated with handlers are properly dropped.
create table t1 (a int); create table t1 (a int);
create temporary table t2 (a int, key(a)); eval create temporary table t2 (a int, key $key_type (a));
handler t1 open as a1; handler t1 open as a1;
handler t2 open as a2; handler t2 open as a2;
handler a2 read a first; handler a2 read a first;
...@@ -640,7 +416,7 @@ handler a1 close; ...@@ -640,7 +416,7 @@ handler a1 close;
# Alter table drop handlers # Alter table drop handlers
create table t1 (a int, key(a)); eval create table t1 (a int, key $key_type (a));
create table t2 like t1; create table t2 like t1;
handler t1 open as a1; handler t1 open as a1;
handler t2 open as a2; handler t2 open as a2;
...@@ -654,7 +430,7 @@ drop table t1, t2; ...@@ -654,7 +430,7 @@ drop table t1, t2;
# Rename table drop handlers # Rename table drop handlers
create table t1 (a int, key(a)); eval create table t1 (a int, key $key_type (a));
handler t1 open as a1; handler t1 open as a1;
handler a1 read a first; handler a1 read a first;
rename table t1 to t2; rename table t1 to t2;
...@@ -664,7 +440,7 @@ drop table t2; ...@@ -664,7 +440,7 @@ drop table t2;
# Optimize table drop handlers # Optimize table drop handlers
create table t1 (a int, key(a)); eval create table t1 (a int, key $key_type (a));
create table t2 like t1; create table t2 like t1;
handler t1 open as a1; handler t1 open as a1;
handler t2 open as a2; handler t2 open as a2;
...@@ -676,56 +452,14 @@ handler a1 close; ...@@ -676,56 +452,14 @@ handler a1 close;
handler a2 close; handler a2 close;
drop table t1, t2; drop table t1, t2;
# Flush tables causes handlers reopen --echo #
--echo # BUG#51877 - HANDLER interface causes invalid memory read
create table t1 (a int, b char(1), key a(a), key b(a,b)); --echo #
insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"), eval CREATE TABLE t1(a INT, KEY $key_type (a));
(5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j"); HANDLER t1 OPEN;
handler t1 open; HANDLER t1 READ a FIRST;
handler t1 read a first; INSERT INTO t1 VALUES(1);
handler t1 read a next; --error 0,ER_CHECKREAD
flush tables; HANDLER t1 READ a NEXT;
handler t1 read a next; HANDLER t1 CLOSE;
handler t1 read a next; DROP TABLE t1;
flush tables with read lock;
handler t1 read a next;
unlock tables;
drop table t1;
--error ER_UNKNOWN_TABLE
handler t1 read a next;
#
# Bug#41110: crash with handler command when used concurrently with alter table
# Bug#41112: crash in mysql_ha_close_table/get_lock_data with alter table
#
--disable_warnings
drop table if exists t1;
--enable_warnings
create table t1 (a int);
insert into t1 values (1);
handler t1 open;
connect(con1,localhost,root,,);
send alter table t1 engine=memory;
connection default;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "rename result table" and info = "alter table t1 engine=memory";
--source include/wait_condition.inc
--error ER_ILLEGAL_HA
handler t1 read a next;
handler t1 close;
connection con1;
--reap
drop table t1;
disconnect con1;
--source include/wait_until_disconnected.inc
connection default;
#
# Bug#44151 using handler commands on information_schema tables crashes server
#
USE information_schema;
--error ER_WRONG_USAGE
HANDLER COLUMNS OPEN;
USE test;
mysql-test/suite/handler/init.inc 0 → 100644
View file @ 505c663a
# Setup things for handler.inc
#
# Input variables
# $engine_type -- storage engine to be tested
# $key_type -- set if you want a non standard key type
#
# This scripts sets up default values for:
# $other_engine_type -- storage engine <> $engine_type
# $other_handler_engine_type -- storage engine <> $engine_type, if possible
# 1. $other_handler_engine_type must support handler
# 2. $other_handler_engine_type must point to an all
# time available storage engine
# have to be set before sourcing this script.
#
# Handler tests don't work with embedded server
#
-- source include/not_embedded.inc
eval SET SESSION STORAGE_ENGINE = $engine_type;
let $other_engine_type= CSV;
let $other_handler_engine_type= MyISAM;
--disable_warnings
drop table if exists t1,t3,t4,t5;
--enable_warnings
# Create default test table
eval create table t1 (a int, b char(10), key a $key_type (a), key b $key_type (a,b));
insert into t1 values
(17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"),
(14,"aaa"),(16,"ccc"),(16,"xxx"),
(20,"ggg"),(21,"hhh"),(22,"iii");
mysql-test/r/handler_innodb.result → mysql-test/suite/handler/innodb.result
View file @ 505c663a
SET SESSION STORAGE_ENGINE = InnoDB; SET SESSION STORAGE_ENGINE = InnoDB;
drop table if exists t1,t3,t4,t5; drop table if exists t1,t3,t4,t5;
create table t1 (a int, b char(10), key a(a), key b(a,b)); create table t1 (a int, b char(10), key a (a), key b (a,b));
insert into t1 values insert into t1 values
(17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"), (17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"),
(14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"), (14,"aaa"),(16,"ccc"),(16,"xxx"),
(20,"ggg"),(21,"hhh"),(22,"iii"); (20,"ggg"),(21,"hhh"),(22,"iii");
handler t1 open as t2; handler t1 open as t2;
handler t2 read a=(SELECT 1);
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1)' at line 1
handler t2 read a first; handler t2 read a first;
a b a b
14 aaa 14 aaa
handler t2 read a next; handler t2 read a next;
a b a b
15 bbb 16 ccc
handler t2 read a next; handler t2 read a next;
a b a b
16 ccc 16 xxx
handler t2 read a prev; handler t2 read a prev;
a b a b
15 bbb 16 ccc
handler t2 read a last; handler t2 read a last;
a b a b
22 iii 22 iii
...@@ -47,7 +45,6 @@ handler t2 read a next; ...@@ -47,7 +45,6 @@ handler t2 read a next;
a b a b
handler t2 read a=(15); handler t2 read a=(15);
a b a b
15 bbb
handler t2 read a=(16); handler t2 read a=(16);
a b a b
16 ccc 16 ccc
...@@ -84,26 +81,64 @@ a b ...@@ -84,26 +81,64 @@ a b
handler t2 read a<(18); handler t2 read a<(18);
a b a b
17 ddd 17 ddd
handler t2 read a=(15);
a b
handler t2 read a>=(15);
a b
16 ccc
handler t2 read a>(15);
a b
16 ccc
handler t2 read a<=(15);
a b
14 aaa
handler t2 read a<(15);
a b
14 aaa
handler t2 read a=(54);
a b
handler t2 read a>=(54);
a b
handler t2 read a>(54);
a b
handler t2 read a<=(54);
a b
22 iii
handler t2 read a<(54);
a b
22 iii
handler t2 read a=(1);
a b
handler t2 read a>=(1);
a b
14 aaa
handler t2 read a>(1);
a b
14 aaa
handler t2 read a<=(1);
a b
handler t2 read a<(1);
a b
handler t2 read a first limit 5; handler t2 read a first limit 5;
a b a b
14 aaa 14 aaa
15 bbb
16 ccc 16 ccc
16 xxx 16 xxx
17 ddd 17 ddd
18 eee
handler t2 read a next limit 3; handler t2 read a next limit 3;
a b a b
18 eee
19 fff 19 fff
19 yyy 19 yyy
20 ggg
handler t2 read a prev limit 10; handler t2 read a prev limit 10;
a b a b
19 yyy
19 fff 19 fff
18 eee 18 eee
17 ddd 17 ddd
16 xxx 16 xxx
16 ccc 16 ccc
15 bbb
14 aaa 14 aaa
handler t2 read a>=(16) limit 4; handler t2 read a>=(16) limit 4;
a b a b
...@@ -135,8 +170,6 @@ a b ...@@ -135,8 +170,6 @@ a b
handler t2 read next; handler t2 read next;
a b a b
19 fff 19 fff
handler t2 read last;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
handler t2 close; handler t2 close;
handler t1 open; handler t1 open;
handler t1 read a next; handler t1 read a next;
...@@ -144,7 +177,7 @@ a b ...@@ -144,7 +177,7 @@ a b
14 aaa 14 aaa
handler t1 read a next; handler t1 read a next;
a b a b
15 bbb 16 ccc
handler t1 close; handler t1 close;
handler t1 open; handler t1 open;
handler t1 read a prev; handler t1 read a prev;
...@@ -163,12 +196,12 @@ handler t2 read first; ...@@ -163,12 +196,12 @@ handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER ERROR 42S02: Unknown table 't2' in HANDLER
handler t1 open as t2; handler t1 open as t2;
drop table t1; drop table t1;
create table t1 (a int); create table t1 (a int not null);
insert into t1 values (17); insert into t1 values (17);
handler t2 read first; handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER ERROR 42S02: Unknown table 't2' in HANDLER
handler t1 open as t2; handler t1 open as t2;
alter table t1 engine=MEMORY; alter table t1 engine=CSV;
handler t2 read first; handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER ERROR 42S02: Unknown table 't2' in HANDLER
drop table t1; drop table t1;
...@@ -191,7 +224,7 @@ handler t1 read first; ...@@ -191,7 +224,7 @@ handler t1 read first;
a a
6 6
drop table t1; drop table t1;
create table t1(a int, index(a)); create table t1(a int, index (a));
insert into t1 values (1), (2), (3); insert into t1 values (1), (2), (3);
handler t1 open; handler t1 open;
handler t1 read a=(W); handler t1 read a=(W);
...@@ -217,7 +250,7 @@ Ok ...@@ -217,7 +250,7 @@ Ok
handler t close; handler t close;
use test; use test;
drop table t1; drop table t1;
create table t1 ( a int, b int, INDEX a (a) ); create table t1 ( a int, b int, INDEX a (a) );
insert into t1 values (1,2), (2,1); insert into t1 values (1,2), (2,1);
handler t1 open; handler t1 open;
handler t1 read a=(1) where b=2; handler t1 read a=(1) where b=2;
...@@ -229,148 +262,6 @@ handler t1 read a=(1) where b=1; ...@@ -229,148 +262,6 @@ handler t1 read a=(1) where b=1;
a b a b
handler t1 close; handler t1 close;
drop table t1; drop table t1;
drop database if exists test_test;
create database test_test;
use test_test;
create table t1(table_id char(20) primary key);
insert into t1 values ('test_test.t1');
insert into t1 values ('');
handler t1 open;
handler t1 read first limit 9;
table_id
test_test.t1
create table t2(table_id char(20) primary key);
insert into t2 values ('test_test.t2');
insert into t2 values ('');
handler t2 open;
handler t2 read first limit 9;
table_id
test_test.t2
use test;
drop table if exists t1;
create table t1(table_id char(20) primary key);
insert into t1 values ('test.t1');
insert into t1 values ('');
handler t1 open;
ERROR 42000: Not unique table/alias: 't1'
use test;
handler test.t1 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler test_test.t1 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler t1 read first limit 9;
table_id
test_test.t1
handler test_test.t2 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler t2 read first limit 9;
table_id
test_test.t2
handler test_test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
drop table test_test.t1;
handler test_test.t2 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t2 close;
drop table test_test.t2;
drop database test_test;
use test;
handler test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
ERROR 42S02: Unknown table 't1' in HANDLER
drop table test.t1;
drop database if exists test_test;
drop table if exists t1;
drop table if exists t2;
drop table if exists t3;
create database test_test;
use test_test;
create table t1 (c1 char(20));
insert into t1 values ('test_test.t1');
create table t3 (c1 char(20));
insert into t3 values ('test_test.t3');
handler t1 open;
handler t1 read first limit 9;
c1
test_test.t1
handler t1 open h1;
handler h1 read first limit 9;
c1
test_test.t1
use test;
create table t1 (c1 char(20));
create table t2 (c1 char(20));
create table t3 (c1 char(20));
insert into t1 values ('t1');
insert into t2 values ('t2');
insert into t3 values ('t3');
handler t1 open;
ERROR 42000: Not unique table/alias: 't1'
handler t2 open t1;
ERROR 42000: Not unique table/alias: 't1'
handler t3 open t1;
ERROR 42000: Not unique table/alias: 't1'
handler t1 read first limit 9;
c1
test_test.t1
handler test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler test.t1 open h1;
ERROR 42000: Not unique table/alias: 'h1'
handler test_test.t1 open h1;
ERROR 42000: Not unique table/alias: 'h1'
handler test_test.t3 open h3;
handler test.t1 open h2;
handler t1 read first limit 9;
c1
test_test.t1
handler h1 read first limit 9;
c1
test_test.t1
handler h2 read first limit 9;
c1
t1
handler h3 read first limit 9;
c1
test_test.t3
handler h2 read first limit 9;
c1
t1
handler test.h1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
handler h1 close;
handler h2 close;
handler t1 read first limit 9;
ERROR 42S02: Unknown table 't1' in HANDLER
handler h1 read first limit 9;
ERROR 42S02: Unknown table 'h1' in HANDLER
handler h2 read first limit 9;
ERROR 42S02: Unknown table 'h2' in HANDLER
handler h3 read first limit 9;
c1
test_test.t3
handler h3 read first limit 9;
c1
test_test.t3
use test_test;
handler h3 read first limit 9;
c1
test_test.t3
handler test.h3 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler h3 close;
use test;
drop table t3;
drop table t2;
drop table t1;
drop database test_test;
create table t1 (c1 char(20)); create table t1 (c1 char(20));
insert into t1 values ("t1"); insert into t1 values ("t1");
handler t1 open as h1; handler t1 open as h1;
...@@ -496,6 +387,11 @@ no1 no2 ...@@ -496,6 +387,11 @@ no1 no2
HANDLER t1 READ `primary` PREV; HANDLER t1 READ `primary` PREV;
no1 no2 no1 no2
1 275 1 275
HANDLER t1 READ `primary` = (1, 1000);
no1 no2
HANDLER t1 READ `primary` NEXT;
no1 no2
2 8
DROP TABLE t1; DROP TABLE t1;
create table t1 (c1 int); create table t1 (c1 int);
insert into t1 values (14397); insert into t1 values (14397);
...@@ -516,14 +412,12 @@ ERROR 42S02: Table 'test.t1' doesn't exist ...@@ -516,14 +412,12 @@ ERROR 42S02: Table 'test.t1' doesn't exist
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 't1'
drop table if exists t1; create table t1 (a int not null) ENGINE=CSV;
create table t1 (a int) ENGINE=MEMORY;
--> client 2 --> client 2
handler t1 open; handler t1 open;
ERROR HY000: Table storage engine for 't1' doesn't have this option ERROR HY000: Table storage engine for 't1' doesn't have this option
--> client 1 --> client 1
drop table t1; drop table t1;
drop table if exists t1;
create table t1 (a int); create table t1 (a int);
handler t1 open as t1_alias; handler t1 open as t1_alias;
handler t1_alias read a next; handler t1_alias read a next;
...@@ -536,50 +430,9 @@ handler t1_alias READ a next where inexistent > 0; ...@@ -536,50 +430,9 @@ handler t1_alias READ a next where inexistent > 0;
ERROR 42S22: Unknown column 'inexistent' in 'field list' ERROR 42S22: Unknown column 'inexistent' in 'field list'
handler t1_alias close; handler t1_alias close;
drop table t1; drop table t1;
drop table if exists t1,t2; create temporary table t1 (a int, b char(1), key a (a), key b(a,b));
create table t1 (c1 int);
create table t2 (c1 int);
insert into t1 values (1);
insert into t2 values (2);
connection: default
handler t1 open;
handler t1 read first;
c1
1
connection: flush
flush tables;;
connection: default
handler t2 open;
handler t2 read first;
c1
2
handler t1 read next;
c1
1
handler t1 close;
handler t2 close;
drop table t1,t2;
drop table if exists t1,t2;
create table t1 (c1 int);
connection: default
handler t1 open;
handler t1 read first;
c1
connection: flush
rename table t1 to t2;;
connection: default
handler t2 open;
handler t2 read first;
c1
handler t1 read next;
ERROR 42S02: Table 'test.t1' doesn't exist
handler t1 close;
handler t2 close;
drop table t2;
drop table if exists t1;
create temporary table t1 (a int, b char(1), key a(a), key b(a,b));
insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"), insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"),
(5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j"); (5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j"),(9,'k');
select a,b from t1; select a,b from t1;
a b a b
0 a 0 a
...@@ -592,24 +445,25 @@ a b ...@@ -592,24 +445,25 @@ a b
7 h 7 h
8 i 8 i
9 j 9 j
9 k
handler t1 open as a1; handler t1 open as a1;
handler a1 read a first; handler a1 read a=(1);
a b
0 a
handler a1 read a next;
a b a b
1 b 1 b
handler a1 read a next; handler a1 read a next;
a b a b
2 c 2 c
handler a1 read a next;
a b
3 d
select a,b from t1; select a,b from t1;
ERROR HY000: Can't reopen table: 'a1' ERROR HY000: Can't reopen table: 'a1'
handler a1 read a prev; handler a1 read a prev;
a b a b
1 b 2 c
handler a1 read a prev; handler a1 read a prev;
a b a b
0 a 1 b
handler a1 read a=(6) where b="g"; handler a1 read a=(6) where b="g";
a b a b
6 g 6 g
...@@ -626,39 +480,28 @@ a b ...@@ -626,39 +480,28 @@ a b
7 h 7 h
8 i 8 i
9 j 9 j
9 k
handler t1 open as a2; handler t1 open as a2;
handler a2 read a first; handler a2 read a=(9);
a b a b
0 a 9 j
handler a2 read a last; handler a2 read a next;
a b
9 k
handler a2 read a prev limit 2;
a b a b
9 j 9 j
8 i
handler a2 read a last;
a b
9 k
handler a2 read a prev; handler a2 read a prev;
a b a b
8 i 9 j
handler a2 close; handler a2 close;
drop table t1; drop table t1;
drop table if exists t1,t2;
create table t1 (a int); create table t1 (a int);
handler t1 open as t1_alias; create temporary table t2 (a int, key (a));
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
flush tables;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias close;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias read first;
a
drop table t1;
handler t1_alias read next;
ERROR 42S02: Unknown table 't1_alias' in HANDLER
create table t1 (a int);
create temporary table t2 (a int, key(a));
handler t1 open as a1; handler t1 open as a1;
handler t2 open as a2; handler t2 open as a2;
handler a2 read a first; handler a2 read a first;
...@@ -668,7 +511,7 @@ handler a2 read a next; ...@@ -668,7 +511,7 @@ handler a2 read a next;
ERROR 42S02: Unknown table 'a2' in HANDLER ERROR 42S02: Unknown table 'a2' in HANDLER
handler a1 close; handler a1 close;
ERROR 42S02: Unknown table 'a1' in HANDLER ERROR 42S02: Unknown table 'a1' in HANDLER
create table t1 (a int, key(a)); create table t1 (a int, key (a));
create table t2 like t1; create table t2 like t1;
handler t1 open as a1; handler t1 open as a1;
handler t2 open as a2; handler t2 open as a2;
...@@ -681,7 +524,7 @@ handler a1 close; ...@@ -681,7 +524,7 @@ handler a1 close;
ERROR 42S02: Unknown table 'a1' in HANDLER ERROR 42S02: Unknown table 'a1' in HANDLER
handler a2 close; handler a2 close;
drop table t1, t2; drop table t1, t2;
create table t1 (a int, key(a)); create table t1 (a int, key (a));
handler t1 open as a1; handler t1 open as a1;
handler a1 read a first; handler a1 read a first;
a a
...@@ -689,7 +532,7 @@ rename table t1 to t2; ...@@ -689,7 +532,7 @@ rename table t1 to t2;
handler a1 read a first; handler a1 read a first;
ERROR 42S02: Unknown table 'a1' in HANDLER ERROR 42S02: Unknown table 'a1' in HANDLER
drop table t2; drop table t2;
create table t1 (a int, key(a)); create table t1 (a int, key (a));
create table t2 like t1; create table t2 like t1;
handler t1 open as a1; handler t1 open as a1;
handler t2 open as a2; handler t2 open as a2;
...@@ -705,41 +548,15 @@ handler a1 close; ...@@ -705,41 +548,15 @@ handler a1 close;
ERROR 42S02: Unknown table 'a1' in HANDLER ERROR 42S02: Unknown table 'a1' in HANDLER
handler a2 close; handler a2 close;
drop table t1, t2; drop table t1, t2;
create table t1 (a int, b char(1), key a(a), key b(a,b)); #
insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"), # BUG#51877 - HANDLER interface causes invalid memory read
(5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j"); #
handler t1 open; CREATE TABLE t1(a INT, KEY (a));
handler t1 read a first; HANDLER t1 OPEN;
a b HANDLER t1 READ a FIRST;
0 a a
handler t1 read a next; INSERT INTO t1 VALUES(1);
a b HANDLER t1 READ a NEXT;
1 b a
flush tables; HANDLER t1 CLOSE;
handler t1 read a next; DROP TABLE t1;
a b
0 a
handler t1 read a next;
a b
1 b
flush tables with read lock;
handler t1 read a next;
a b
0 a
unlock tables;
drop table t1;
handler t1 read a next;
ERROR 42S02: Unknown table 't1' in HANDLER
drop table if exists t1;
create table t1 (a int);
insert into t1 values (1);
handler t1 open;
alter table t1 engine=memory;
handler t1 read a next;
ERROR HY000: Table storage engine for 't1' doesn't have this option
handler t1 close;
drop table t1;
USE information_schema;
HANDLER COLUMNS OPEN;
ERROR HY000: Incorrect usage of HANDLER OPEN and information_schema
USE test;
mysql-test/t/handler_innodb.test → mysql-test/suite/handler/innodb.test
View file @ 505c663a
...@@ -5,16 +5,13 @@ ...@@ -5,16 +5,13 @@
# Last update: # Last update:
# 2006-07-31 ML test refactored (MySQL 5.1) # 2006-07-31 ML test refactored (MySQL 5.1)
# code of t/handler.test and t/innodb_handler.test united # code of t/handler.test and t/innodb_handler.test united
# main testing code put into include/handler.inc # main testing code put into handler.inc
# rename t/innodb_handler.test to t/handler_innodb.test # rename t/innodb_handler.test to t/handler_innodb.test
# #
# should work in embedded server after mysqltest is fixed
--source include/not_embedded.inc
--source include/have_innodb.inc --source include/have_innodb.inc
let $engine_type= InnoDB; let $engine_type= InnoDB;
let $other_engine_type= MEMORY;
let $other_handler_engine_type= MyISAM;
--source include/handler.inc --source init.inc
--source handler.inc
mysql-test/suite/handler/interface.result 0 → 100644
View file @ 505c663a
drop table if exists t1,t3,t4,t5;
drop database if exists test_test;
SET SESSION STORAGE_ENGINE = MyISAM;
drop table if exists t1,t3,t4,t5;
create table t1 (a int, b char(10), key a (a), key b (a,b));
insert into t1 values
(17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"),
(14,"aaa"),(16,"ccc"),(16,"xxx"),
(20,"ggg"),(21,"hhh"),(22,"iii");
handler t1 open;
handler t1 read a=(SELECT 1);
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1)' at line 1
handler t1 read a=(1) FIRST;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FIRST' at line 1
handler t1 read a=(1) NEXT;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NEXT' at line 1
handler t1 read last;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
handler t1 close;
drop table t1;
CREATE TABLE t1(a INT, PRIMARY KEY(a));
insert into t1 values(1),(2);
handler t1 open;
handler t1 read primary=(1);
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary=(1)' at line 1
handler t1 read `primary`=(1);
a
1
handler t1 close;
drop table t1;
create database test_test;
use test_test;
create table t1(table_id char(20), primary key (table_id));
insert into t1 values ('test_test.t1');
insert into t1 values ('');
handler t1 open;
handler t1 read first limit 9;
table_id
test_test.t1
create table t2(table_id char(20), primary key (table_id));
insert into t2 values ('test_test.t2');
insert into t2 values ('');
handler t2 open;
handler t2 read first limit 9;
table_id
test_test.t2
use test;
create table t1(table_id char(20), primary key (table_id));
insert into t1 values ('test.t1');
insert into t1 values ('');
handler t1 open;
ERROR 42000: Not unique table/alias: 't1'
use test;
handler test.t1 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler test_test.t1 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler t1 read first limit 9;
table_id
test_test.t1
handler test_test.t2 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler t2 read first limit 9;
table_id
test_test.t2
handler test_test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
drop table test_test.t1;
handler test_test.t2 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t2 close;
drop table test_test.t2;
drop database test_test;
use test;
handler test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
ERROR 42S02: Unknown table 't1' in HANDLER
drop table test.t1;
create database test_test;
use test_test;
create table t1 (c1 char(20));
insert into t1 values ('test_test.t1');
create table t3 (c1 char(20));
insert into t3 values ('test_test.t3');
handler t1 open;
handler t1 read first limit 9;
c1
test_test.t1
handler t1 open h1;
handler h1 read first limit 9;
c1
test_test.t1
use test;
create table t1 (c1 char(20));
create table t2 (c1 char(20));
create table t3 (c1 char(20));
insert into t1 values ('t1');
insert into t2 values ('t2');
insert into t3 values ('t3');
handler t1 open;
ERROR 42000: Not unique table/alias: 't1'
handler t2 open t1;
ERROR 42000: Not unique table/alias: 't1'
handler t3 open t1;
ERROR 42000: Not unique table/alias: 't1'
handler t1 read first limit 9;
c1
test_test.t1
handler test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler test.t1 open h1;
ERROR 42000: Not unique table/alias: 'h1'
handler test_test.t1 open h1;
ERROR 42000: Not unique table/alias: 'h1'
handler test_test.t3 open h3;
handler test.t1 open h2;
handler t1 read first limit 9;
c1
test_test.t1
handler h1 read first limit 9;
c1
test_test.t1
handler h2 read first limit 9;
c1
t1
handler h3 read first limit 9;
c1
test_test.t3
handler h2 read first limit 9;
c1
t1
handler test.h1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
handler h1 close;
handler h2 close;
handler t1 read first limit 9;
ERROR 42S02: Unknown table 't1' in HANDLER
handler h1 read first limit 9;
ERROR 42S02: Unknown table 'h1' in HANDLER
handler h2 read first limit 9;
ERROR 42S02: Unknown table 'h2' in HANDLER
handler h3 read first limit 9;
c1
test_test.t3
handler h3 read first limit 9;
c1
test_test.t3
use test_test;
handler h3 read first limit 9;
c1
test_test.t3
handler test.h3 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler h3 close;
use test;
drop table t3;
drop table t2;
drop table t1;
drop database test_test;
create table t1 (c1 int);
create table t2 (c1 int);
insert into t1 values (1);
insert into t2 values (2);
connection: default
handler t1 open;
handler t1 read first;
c1
1
connection: flush
flush tables;;
connection: default
handler t2 open;
handler t2 read first;
c1
2
handler t1 read next;
c1
1
handler t1 close;
handler t2 close;
drop table t1,t2;
create table t1 (a int);
handler t1 open as t1_alias;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
flush tables;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias close;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias read first;
a
drop table t1;
handler t1_alias read next;
ERROR 42S02: Unknown table 't1_alias' in HANDLER
create table t1 (c1 int);
connection: default
handler t1 open;
handler t1 read first;
c1
connection: flush
rename table t1 to t2;;
connection: default
handler t2 open;
handler t2 read first;
c1
handler t1 read next;
ERROR 42S02: Table 'test.t1' doesn't exist
handler t1 close;
handler t2 close;
drop table t2;
create table t1 (a int, b char(1), key a (a), key b (a,b));
insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"),
(5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j");
handler t1 open;
handler t1 read a first;
a b
0 a
handler t1 read a next;
a b
1 b
flush tables;
handler t1 read a next;
a b
0 a
handler t1 read a next;
a b
1 b
flush tables with read lock;
handler t1 read a next;
a b
0 a
unlock tables;
drop table t1;
handler t1 read a next;
ERROR 42S02: Unknown table 't1' in HANDLER
drop table if exists t1;
create table t1 (a int not null);
insert into t1 values (1);
handler t1 open;
alter table t1 engine=csv;
handler t1 read a next;
ERROR HY000: Table storage engine for 't1' doesn't have this option
handler t1 close;
drop table t1;
USE information_schema;
HANDLER COLUMNS OPEN;
ERROR HY000: Incorrect usage of HANDLER OPEN and information_schema
mysql-test/suite/handler/interface.test 0 → 100644
View file @ 505c663a
#
# Tests of handler interface that are system independent
#
# Handler tests don't work yet with embedded server
#
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1,t3,t4,t5;
drop database if exists test_test;
--enable_warnings
# Run tests with myisam (any engine should be ok)
let $engine_type= MyISAM;
--source init.inc
#
# Do some syntax checking
#
handler t1 open;
--error ER_PARSE_ERROR
handler t1 read a=(SELECT 1);
--error ER_PARSE_ERROR
handler t1 read a=(1) FIRST;
--error ER_PARSE_ERROR
handler t1 read a=(1) NEXT;
--error ER_PARSE_ERROR
handler t1 read last;
handler t1 close;
drop table t1;
CREATE TABLE t1(a INT, PRIMARY KEY(a));
insert into t1 values(1),(2);
handler t1 open;
--error ER_PARSE_ERROR
handler t1 read primary=(1);
handler t1 read `primary`=(1);
handler t1 close;
drop table t1;
#
# Check if two database names beginning the same are seen as different.
#
# This database begins like the usual 'test' database.
#
create database test_test;
use test_test;
eval create table t1(table_id char(20), primary key $key_type (table_id));
insert into t1 values ('test_test.t1');
insert into t1 values ('');
handler t1 open;
handler t1 read first limit 9;
eval create table t2(table_id char(20), primary key $key_type (table_id));
insert into t2 values ('test_test.t2');
insert into t2 values ('');
handler t2 open;
handler t2 read first limit 9;
#
# This is the usual 'test' database.
#
use test;
eval create table t1(table_id char(20), primary key $key_type (table_id));
insert into t1 values ('test.t1');
insert into t1 values ('');
--error 1066
handler t1 open;
#
# Check accessibility of all the tables.
#
use test;
--error 1064
handler test.t1 read first limit 9;
--error 1064
handler test_test.t1 read first limit 9;
handler t1 read first limit 9;
--error 1064
handler test_test.t2 read first limit 9;
handler t2 read first limit 9;
#
# Cleanup.
#
--error 1064
handler test_test.t1 close;
handler t1 close;
drop table test_test.t1;
--error 1064
handler test_test.t2 close;
handler t2 close;
drop table test_test.t2;
drop database test_test;
#
use test;
--error 1064
handler test.t1 close;
--error 1109
handler t1 close;
drop table test.t1;
#
# BUG#4335 one name can be handler open'ed many times
#
create database test_test;
use test_test;
create table t1 (c1 char(20));
insert into t1 values ('test_test.t1');
create table t3 (c1 char(20));
insert into t3 values ('test_test.t3');
handler t1 open;
handler t1 read first limit 9;
handler t1 open h1;
handler h1 read first limit 9;
use test;
create table t1 (c1 char(20));
create table t2 (c1 char(20));
create table t3 (c1 char(20));
insert into t1 values ('t1');
insert into t2 values ('t2');
insert into t3 values ('t3');
--error 1066
handler t1 open;
--error 1066
handler t2 open t1;
--error 1066
handler t3 open t1;
handler t1 read first limit 9;
--error 1064
handler test.t1 close;
--error 1066
handler test.t1 open h1;
--error 1066
handler test_test.t1 open h1;
handler test_test.t3 open h3;
handler test.t1 open h2;
handler t1 read first limit 9;
handler h1 read first limit 9;
handler h2 read first limit 9;
handler h3 read first limit 9;
handler h2 read first limit 9;
--error 1064
handler test.h1 close;
handler t1 close;
handler h1 close;
handler h2 close;
--error 1109
handler t1 read first limit 9;
--error 1109
handler h1 read first limit 9;
--error 1109
handler h2 read first limit 9;
handler h3 read first limit 9;
handler h3 read first limit 9;
use test_test;
handler h3 read first limit 9;
--error 1064
handler test.h3 read first limit 9;
handler h3 close;
use test;
drop table t3;
drop table t2;
drop table t1;
drop database test_test;
#
# Bug#21587 FLUSH TABLES causes server crash when used with HANDLER statements
#
create table t1 (c1 int);
create table t2 (c1 int);
insert into t1 values (1);
insert into t2 values (2);
--echo connection: default
handler t1 open;
handler t1 read first;
connect (flush,localhost,root,,);
connection flush;
--echo connection: flush
--send flush tables;
connection default;
--echo connection: default
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Flushing tables";
--source include/wait_condition.inc
handler t2 open;
handler t2 read first;
handler t1 read next;
handler t1 close;
handler t2 close;
connection flush;
reap;
connection default;
drop table t1,t2;
disconnect flush;
#
# Bug#31397 Inconsistent drop table behavior of handler tables.
#
create table t1 (a int);
handler t1 open as t1_alias;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
flush tables;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias close;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias read first;
drop table t1;
--error ER_UNKNOWN_TABLE
handler t1_alias read next;
#
# Bug#31409 RENAME TABLE causes server crash or deadlock when used with
# HANDLER statements
#
create table t1 (c1 int);
--echo connection: default
handler t1 open;
handler t1 read first;
connect (flush,localhost,root,,);
connection flush;
--echo connection: flush
--send rename table t1 to t2;
connection default;
--echo connection: default
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table" and info = "rename table t1 to t2";
--source include/wait_condition.inc
handler t2 open;
handler t2 read first;
--error ER_NO_SUCH_TABLE
handler t1 read next;
handler t1 close;
handler t2 close;
connection flush;
reap;
connection default;
drop table t2;
disconnect flush;
# Flush tables causes handlers reopen
eval create table t1 (a int, b char(1), key a $key_type (a), key b $key_type (a,b));
insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"),
(5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j");
handler t1 open;
handler t1 read a first;
handler t1 read a next;
flush tables;
handler t1 read a next;
handler t1 read a next;
flush tables with read lock;
handler t1 read a next;
unlock tables;
drop table t1;
--error ER_UNKNOWN_TABLE
handler t1 read a next;
#
# Bug#41110: crash with handler command when used concurrently with alter table
# Bug#41112: crash in mysql_ha_close_table/get_lock_data with alter table
#
--disable_warnings
drop table if exists t1;
--enable_warnings
create table t1 (a int not null);
insert into t1 values (1);
handler t1 open;
connect(con1,localhost,root,,);
send alter table t1 engine=csv;
connection default;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "rename result table" and info = "alter table t1 engine=csv";
--source include/wait_condition.inc
--error ER_ILLEGAL_HA
handler t1 read a next;
handler t1 close;
connection con1;
--reap
drop table t1;
disconnect con1;
--source include/wait_until_disconnected.inc
connection default;
#
# Bug#44151 using handler commands on information_schema tables crashes server
#
USE information_schema;
--error ER_WRONG_USAGE
HANDLER COLUMNS OPEN;
mysql-test/r/handler_myisam.result → mysql-test/suite/handler/myisam.result
View file @ 505c663a
SET SESSION STORAGE_ENGINE = MyISAM; SET SESSION STORAGE_ENGINE = MyISAM;
drop table if exists t1,t3,t4,t5; drop table if exists t1,t3,t4,t5;
create table t1 (a int, b char(10), key a(a), key b(a,b)); create table t1 (a int, b char(10), key a (a), key b (a,b));
insert into t1 values insert into t1 values
(17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"), (17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"),
(14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"), (14,"aaa"),(16,"ccc"),(16,"xxx"),
(20,"ggg"),(21,"hhh"),(22,"iii"); (20,"ggg"),(21,"hhh"),(22,"iii");
handler t1 open as t2; handler t1 open as t2;
handler t2 read a=(SELECT 1);
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1)' at line 1
handler t2 read a first; handler t2 read a first;
a b a b
14 aaa 14 aaa
handler t2 read a next; handler t2 read a next;
a b a b
15 bbb 16 ccc
handler t2 read a next; handler t2 read a next;
a b a b
16 ccc 16 xxx
handler t2 read a prev; handler t2 read a prev;
a b a b
15 bbb 16 ccc
handler t2 read a last; handler t2 read a last;
a b a b
22 iii 22 iii
...@@ -47,7 +45,6 @@ handler t2 read a next; ...@@ -47,7 +45,6 @@ handler t2 read a next;
a b a b
handler t2 read a=(15); handler t2 read a=(15);
a b a b
15 bbb
handler t2 read a=(16); handler t2 read a=(16);
a b a b
16 ccc 16 ccc
...@@ -84,26 +81,64 @@ a b ...@@ -84,26 +81,64 @@ a b
handler t2 read a<(18); handler t2 read a<(18);
a b a b
17 ddd 17 ddd
handler t2 read a=(15);
a b
handler t2 read a>=(15);
a b
16 ccc
handler t2 read a>(15);
a b
16 ccc
handler t2 read a<=(15);
a b
14 aaa
handler t2 read a<(15);
a b
14 aaa
handler t2 read a=(54);
a b
handler t2 read a>=(54);
a b
handler t2 read a>(54);
a b
handler t2 read a<=(54);
a b
22 iii
handler t2 read a<(54);
a b
22 iii
handler t2 read a=(1);
a b
handler t2 read a>=(1);
a b
14 aaa
handler t2 read a>(1);
a b
14 aaa
handler t2 read a<=(1);
a b
handler t2 read a<(1);
a b
handler t2 read a first limit 5; handler t2 read a first limit 5;
a b a b
14 aaa 14 aaa
15 bbb
16 ccc 16 ccc
16 xxx 16 xxx
17 ddd 17 ddd
18 eee
handler t2 read a next limit 3; handler t2 read a next limit 3;
a b a b
18 eee
19 fff 19 fff
19 yyy 19 yyy
20 ggg
handler t2 read a prev limit 10; handler t2 read a prev limit 10;
a b a b
19 yyy
19 fff 19 fff
18 eee 18 eee
17 ddd 17 ddd
16 xxx 16 xxx
16 ccc 16 ccc
15 bbb
14 aaa 14 aaa
handler t2 read a>=(16) limit 4; handler t2 read a>=(16) limit 4;
a b a b
...@@ -135,8 +170,6 @@ a b ...@@ -135,8 +170,6 @@ a b
handler t2 read next; handler t2 read next;
a b a b
19 fff 19 fff
handler t2 read last;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
handler t2 close; handler t2 close;
handler t1 open; handler t1 open;
handler t1 read a next; handler t1 read a next;
...@@ -144,7 +177,7 @@ a b ...@@ -144,7 +177,7 @@ a b
14 aaa 14 aaa
handler t1 read a next; handler t1 read a next;
a b a b
15 bbb 16 ccc
handler t1 close; handler t1 close;
handler t1 open; handler t1 open;
handler t1 read a prev; handler t1 read a prev;
...@@ -163,12 +196,12 @@ handler t2 read first; ...@@ -163,12 +196,12 @@ handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER ERROR 42S02: Unknown table 't2' in HANDLER
handler t1 open as t2; handler t1 open as t2;
drop table t1; drop table t1;
create table t1 (a int); create table t1 (a int not null);
insert into t1 values (17); insert into t1 values (17);
handler t2 read first; handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER ERROR 42S02: Unknown table 't2' in HANDLER
handler t1 open as t2; handler t1 open as t2;
alter table t1 engine=MEMORY; alter table t1 engine=CSV;
handler t2 read first; handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER ERROR 42S02: Unknown table 't2' in HANDLER
drop table t1; drop table t1;
...@@ -191,7 +224,7 @@ handler t1 read first; ...@@ -191,7 +224,7 @@ handler t1 read first;
a a
6 6
drop table t1; drop table t1;
create table t1(a int, index(a)); create table t1(a int, index (a));
insert into t1 values (1), (2), (3); insert into t1 values (1), (2), (3);
handler t1 open; handler t1 open;
handler t1 read a=(W); handler t1 read a=(W);
...@@ -217,7 +250,7 @@ Ok ...@@ -217,7 +250,7 @@ Ok
handler t close; handler t close;
use test; use test;
drop table t1; drop table t1;
create table t1 ( a int, b int, INDEX a (a) ); create table t1 ( a int, b int, INDEX a (a) );
insert into t1 values (1,2), (2,1); insert into t1 values (1,2), (2,1);
handler t1 open; handler t1 open;
handler t1 read a=(1) where b=2; handler t1 read a=(1) where b=2;
...@@ -229,148 +262,6 @@ handler t1 read a=(1) where b=1; ...@@ -229,148 +262,6 @@ handler t1 read a=(1) where b=1;
a b a b
handler t1 close; handler t1 close;
drop table t1; drop table t1;
drop database if exists test_test;
create database test_test;
use test_test;
create table t1(table_id char(20) primary key);
insert into t1 values ('test_test.t1');
insert into t1 values ('');
handler t1 open;
handler t1 read first limit 9;
table_id
test_test.t1
create table t2(table_id char(20) primary key);
insert into t2 values ('test_test.t2');
insert into t2 values ('');
handler t2 open;
handler t2 read first limit 9;
table_id
test_test.t2
use test;
drop table if exists t1;
create table t1(table_id char(20) primary key);
insert into t1 values ('test.t1');
insert into t1 values ('');
handler t1 open;
ERROR 42000: Not unique table/alias: 't1'
use test;
handler test.t1 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler test_test.t1 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler t1 read first limit 9;
table_id
test_test.t1
handler test_test.t2 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler t2 read first limit 9;
table_id
test_test.t2
handler test_test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
drop table test_test.t1;
handler test_test.t2 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t2 close;
drop table test_test.t2;
drop database test_test;
use test;
handler test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
ERROR 42S02: Unknown table 't1' in HANDLER
drop table test.t1;
drop database if exists test_test;
drop table if exists t1;
drop table if exists t2;
drop table if exists t3;
create database test_test;
use test_test;
create table t1 (c1 char(20));
insert into t1 values ('test_test.t1');
create table t3 (c1 char(20));
insert into t3 values ('test_test.t3');
handler t1 open;
handler t1 read first limit 9;
c1
test_test.t1
handler t1 open h1;
handler h1 read first limit 9;
c1
test_test.t1
use test;
create table t1 (c1 char(20));
create table t2 (c1 char(20));
create table t3 (c1 char(20));
insert into t1 values ('t1');
insert into t2 values ('t2');
insert into t3 values ('t3');
handler t1 open;
ERROR 42000: Not unique table/alias: 't1'
handler t2 open t1;
ERROR 42000: Not unique table/alias: 't1'
handler t3 open t1;
ERROR 42000: Not unique table/alias: 't1'
handler t1 read first limit 9;
c1
test_test.t1
handler test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler test.t1 open h1;
ERROR 42000: Not unique table/alias: 'h1'
handler test_test.t1 open h1;
ERROR 42000: Not unique table/alias: 'h1'
handler test_test.t3 open h3;
handler test.t1 open h2;
handler t1 read first limit 9;
c1
test_test.t1
handler h1 read first limit 9;
c1
test_test.t1
handler h2 read first limit 9;
c1
t1
handler h3 read first limit 9;
c1
test_test.t3
handler h2 read first limit 9;
c1
t1
handler test.h1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
handler h1 close;
handler h2 close;
handler t1 read first limit 9;
ERROR 42S02: Unknown table 't1' in HANDLER
handler h1 read first limit 9;
ERROR 42S02: Unknown table 'h1' in HANDLER
handler h2 read first limit 9;
ERROR 42S02: Unknown table 'h2' in HANDLER
handler h3 read first limit 9;
c1
test_test.t3
handler h3 read first limit 9;
c1
test_test.t3
use test_test;
handler h3 read first limit 9;
c1
test_test.t3
handler test.h3 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler h3 close;
use test;
drop table t3;
drop table t2;
drop table t1;
drop database test_test;
create table t1 (c1 char(20)); create table t1 (c1 char(20));
insert into t1 values ("t1"); insert into t1 values ("t1");
handler t1 open as h1; handler t1 open as h1;
...@@ -495,6 +386,11 @@ no1 no2 ...@@ -495,6 +386,11 @@ no1 no2
HANDLER t1 READ `primary` PREV; HANDLER t1 READ `primary` PREV;
no1 no2 no1 no2
1 275 1 275
HANDLER t1 READ `primary` = (1, 1000);
no1 no2
HANDLER t1 READ `primary` NEXT;
no1 no2
2 6
DROP TABLE t1; DROP TABLE t1;
create table t1 (c1 int); create table t1 (c1 int);
insert into t1 values (14397); insert into t1 values (14397);
...@@ -515,14 +411,12 @@ ERROR 42S02: Table 'test.t1' doesn't exist ...@@ -515,14 +411,12 @@ ERROR 42S02: Table 'test.t1' doesn't exist
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 't1'
drop table if exists t1; create table t1 (a int not null) ENGINE=CSV;
create table t1 (a int) ENGINE=MEMORY;
--> client 2 --> client 2
handler t1 open; handler t1 open;
ERROR HY000: Table storage engine for 't1' doesn't have this option ERROR HY000: Table storage engine for 't1' doesn't have this option
--> client 1 --> client 1
drop table t1; drop table t1;
drop table if exists t1;
create table t1 (a int); create table t1 (a int);
handler t1 open as t1_alias; handler t1 open as t1_alias;
handler t1_alias read a next; handler t1_alias read a next;
...@@ -535,50 +429,9 @@ handler t1_alias READ a next where inexistent > 0; ...@@ -535,50 +429,9 @@ handler t1_alias READ a next where inexistent > 0;
ERROR 42S22: Unknown column 'inexistent' in 'field list' ERROR 42S22: Unknown column 'inexistent' in 'field list'
handler t1_alias close; handler t1_alias close;
drop table t1; drop table t1;
drop table if exists t1,t2; create temporary table t1 (a int, b char(1), key a (a), key b(a,b));
create table t1 (c1 int);
create table t2 (c1 int);
insert into t1 values (1);
insert into t2 values (2);
connection: default
handler t1 open;
handler t1 read first;
c1
1
connection: flush
flush tables;;
connection: default
handler t2 open;
handler t2 read first;
c1
2
handler t1 read next;
c1
1
handler t1 close;
handler t2 close;
drop table t1,t2;
drop table if exists t1,t2;
create table t1 (c1 int);
connection: default
handler t1 open;
handler t1 read first;
c1
connection: flush
rename table t1 to t2;;
connection: default
handler t2 open;
handler t2 read first;
c1
handler t1 read next;
ERROR 42S02: Table 'test.t1' doesn't exist
handler t1 close;
handler t2 close;
drop table t2;
drop table if exists t1;
create temporary table t1 (a int, b char(1), key a(a), key b(a,b));
insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"), insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"),
(5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j"); (5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j"),(9,'k');
select a,b from t1; select a,b from t1;
a b a b
0 a 0 a
...@@ -591,24 +444,25 @@ a b ...@@ -591,24 +444,25 @@ a b
7 h 7 h
8 i 8 i
9 j 9 j
9 k
handler t1 open as a1; handler t1 open as a1;
handler a1 read a first; handler a1 read a=(1);
a b
0 a
handler a1 read a next;
a b a b
1 b 1 b
handler a1 read a next; handler a1 read a next;
a b a b
2 c 2 c
handler a1 read a next;
a b
3 d
select a,b from t1; select a,b from t1;
ERROR HY000: Can't reopen table: 'a1' ERROR HY000: Can't reopen table: 'a1'
handler a1 read a prev; handler a1 read a prev;
a b a b
1 b 2 c
handler a1 read a prev; handler a1 read a prev;
a b a b
0 a 1 b
handler a1 read a=(6) where b="g"; handler a1 read a=(6) where b="g";
a b a b
6 g 6 g
...@@ -625,39 +479,28 @@ a b ...@@ -625,39 +479,28 @@ a b
7 h 7 h
8 i 8 i
9 j 9 j
9 k
handler t1 open as a2; handler t1 open as a2;
handler a2 read a first; handler a2 read a=(9);
a b a b
0 a 9 j
handler a2 read a last; handler a2 read a next;
a b
9 k
handler a2 read a prev limit 2;
a b a b
9 j 9 j
8 i
handler a2 read a last;
a b
9 k
handler a2 read a prev; handler a2 read a prev;
a b a b
8 i 9 j
handler a2 close; handler a2 close;
drop table t1; drop table t1;
drop table if exists t1,t2;
create table t1 (a int);
handler t1 open as t1_alias;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
flush tables;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias close;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias read first;
a
drop table t1;
handler t1_alias read next;
ERROR 42S02: Unknown table 't1_alias' in HANDLER
create table t1 (a int); create table t1 (a int);
create temporary table t2 (a int, key(a)); create temporary table t2 (a int, key (a));
handler t1 open as a1; handler t1 open as a1;
handler t2 open as a2; handler t2 open as a2;
handler a2 read a first; handler a2 read a first;
...@@ -667,7 +510,7 @@ handler a2 read a next; ...@@ -667,7 +510,7 @@ handler a2 read a next;
ERROR 42S02: Unknown table 'a2' in HANDLER ERROR 42S02: Unknown table 'a2' in HANDLER
handler a1 close; handler a1 close;
ERROR 42S02: Unknown table 'a1' in HANDLER ERROR 42S02: Unknown table 'a1' in HANDLER
create table t1 (a int, key(a)); create table t1 (a int, key (a));
create table t2 like t1; create table t2 like t1;
handler t1 open as a1; handler t1 open as a1;
handler t2 open as a2; handler t2 open as a2;
...@@ -680,7 +523,7 @@ handler a1 close; ...@@ -680,7 +523,7 @@ handler a1 close;
ERROR 42S02: Unknown table 'a1' in HANDLER ERROR 42S02: Unknown table 'a1' in HANDLER
handler a2 close; handler a2 close;
drop table t1, t2; drop table t1, t2;
create table t1 (a int, key(a)); create table t1 (a int, key (a));
handler t1 open as a1; handler t1 open as a1;
handler a1 read a first; handler a1 read a first;
a a
...@@ -688,7 +531,7 @@ rename table t1 to t2; ...@@ -688,7 +531,7 @@ rename table t1 to t2;
handler a1 read a first; handler a1 read a first;
ERROR 42S02: Unknown table 'a1' in HANDLER ERROR 42S02: Unknown table 'a1' in HANDLER
drop table t2; drop table t2;
create table t1 (a int, key(a)); create table t1 (a int, key (a));
create table t2 like t1; create table t2 like t1;
handler t1 open as a1; handler t1 open as a1;
handler t2 open as a2; handler t2 open as a2;
...@@ -703,44 +546,19 @@ handler a1 close; ...@@ -703,44 +546,19 @@ handler a1 close;
ERROR 42S02: Unknown table 'a1' in HANDLER ERROR 42S02: Unknown table 'a1' in HANDLER
handler a2 close; handler a2 close;
drop table t1, t2; drop table t1, t2;
create table t1 (a int, b char(1), key a(a), key b(a,b)); #
insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"), # BUG#51877 - HANDLER interface causes invalid memory read
(5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j"); #
handler t1 open; CREATE TABLE t1(a INT, KEY (a));
handler t1 read a first; HANDLER t1 OPEN;
a b HANDLER t1 READ a FIRST;
0 a a
handler t1 read a next; INSERT INTO t1 VALUES(1);
a b HANDLER t1 READ a NEXT;
1 b a
flush tables; 1
handler t1 read a next; HANDLER t1 CLOSE;
a b DROP TABLE t1;
0 a
handler t1 read a next;
a b
1 b
flush tables with read lock;
handler t1 read a next;
a b
0 a
unlock tables;
drop table t1;
handler t1 read a next;
ERROR 42S02: Unknown table 't1' in HANDLER
drop table if exists t1;
create table t1 (a int);
insert into t1 values (1);
handler t1 open;
alter table t1 engine=memory;
handler t1 read a next;
ERROR HY000: Table storage engine for 't1' doesn't have this option
handler t1 close;
drop table t1;
USE information_schema;
HANDLER COLUMNS OPEN;
ERROR HY000: Incorrect usage of HANDLER OPEN and information_schema
USE test;
# #
# BUG #46456: HANDLER OPEN + TRUNCATE + DROP (temporary) TABLE, crash # BUG #46456: HANDLER OPEN + TRUNCATE + DROP (temporary) TABLE, crash
# #
...@@ -757,19 +575,6 @@ HANDLER t1 READ FIRST; ...@@ -757,19 +575,6 @@ HANDLER t1 READ FIRST;
ERROR 42S02: Unknown table 't1' in HANDLER ERROR 42S02: Unknown table 't1' in HANDLER
DROP TABLE t1; DROP TABLE t1;
# #
# BUG#51877 - HANDLER interface causes invalid memory read
#
CREATE TABLE t1(a INT, KEY(a));
HANDLER t1 OPEN;
HANDLER t1 READ a FIRST;
a
INSERT INTO t1 VALUES(1);
HANDLER t1 READ a NEXT;
a
1
HANDLER t1 CLOSE;
DROP TABLE t1;
#
# Bug #54007: assert in ha_myisam::index_next , HANDLER # Bug #54007: assert in ha_myisam::index_next , HANDLER
# #
CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a), KEY b(b), KEY ab(a, b)); CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a), KEY b(b), KEY ab(a, b));
...@@ -821,12 +626,13 @@ HANDLER t1 READ b NEXT; ...@@ -821,12 +626,13 @@ HANDLER t1 READ b NEXT;
a b a b
HANDLER t1 READ NEXT; HANDLER t1 READ NEXT;
a b a b
4 40 2 20
HANDLER t1 READ NEXT; HANDLER t1 READ NEXT;
a b a b
3 30 1 10
HANDLER t1 READ NEXT; HANDLER t1 READ NEXT;
a b a b
4 40
HANDLER t1 CLOSE; HANDLER t1 CLOSE;
HANDLER t1 OPEN; HANDLER t1 OPEN;
HANDLER t1 READ FIRST; HANDLER t1 READ FIRST;
......
mysql-test/t/handler_myisam.test → mysql-test/suite/handler/myisam.test
View file @ 505c663a
...@@ -5,20 +5,14 @@ ...@@ -5,20 +5,14 @@
# Last update: # Last update:
# 2006-07-31 ML test refactored (MySQL 5.1) # 2006-07-31 ML test refactored (MySQL 5.1)
# code of t/handler.test and t/innodb_handler.test united # code of t/handler.test and t/innodb_handler.test united
# main testing code put into include/handler.inc # main testing code put into handler.inc
# rename t/handler.test to t/handler_myisam.test # rename t/handler.test to t/handler_myisam.test
# #
# should work in embedded server after mysqltest is fixed
--source include/not_embedded.inc
let $engine_type= MyISAM; let $engine_type= MyISAM;
let $other_engine_type= MEMORY;
# There is unfortunately no other all time available storage engine
# which supports the handler interface
let $other_handler_engine_type= MyISAM;
--source include/handler.inc --source init.inc
--source handler.inc
--echo # --echo #
--echo # BUG #46456: HANDLER OPEN + TRUNCATE + DROP (temporary) TABLE, crash --echo # BUG #46456: HANDLER OPEN + TRUNCATE + DROP (temporary) TABLE, crash
...@@ -37,18 +31,6 @@ TRUNCATE t1; ...@@ -37,18 +31,6 @@ TRUNCATE t1;
HANDLER t1 READ FIRST; HANDLER t1 READ FIRST;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # BUG#51877 - HANDLER interface causes invalid memory read
--echo #
CREATE TABLE t1(a INT, KEY(a));
HANDLER t1 OPEN;
HANDLER t1 READ a FIRST;
INSERT INTO t1 VALUES(1);
HANDLER t1 READ a NEXT;
HANDLER t1 CLOSE;
DROP TABLE t1;
--echo # --echo #
--echo # Bug #54007: assert in ha_myisam::index_next , HANDLER --echo # Bug #54007: assert in ha_myisam::index_next , HANDLER
--echo # --echo #
......
mysql-test/t/lock_multi.test
View file @ 505c663a
...@@ -484,22 +484,6 @@ unlock tables; ...@@ -484,22 +484,6 @@ unlock tables;
connection default; connection default;
drop table t1; drop table t1;
#
# Bug#25856 HANDLER table OPEN in one connection lock DROP TABLE in another one
#
--disable_warnings
drop table if exists t1;
--enable_warnings
create table t1 (a int) ENGINE=MEMORY;
--echo --> client 2
connection locker;
--error ER_ILLEGAL_HA
handler t1 open;
--echo --> client 1
connection default;
drop table t1;
# Disconnect sessions used in many subtests above # Disconnect sessions used in many subtests above
disconnect locker; disconnect locker;
disconnect reader; disconnect reader;
......
mysys/tree.c
View file @ 505c663a
...@@ -375,6 +375,7 @@ void *tree_search_key(TREE *tree, const void *key, ...@@ -375,6 +375,7 @@ void *tree_search_key(TREE *tree, const void *key,
case HA_READ_KEY_EXACT: case HA_READ_KEY_EXACT:
case HA_READ_KEY_OR_NEXT: case HA_READ_KEY_OR_NEXT:
case HA_READ_BEFORE_KEY: case HA_READ_BEFORE_KEY:
case HA_READ_KEY_OR_PREV:
last_equal_element= parents; last_equal_element= parents;
cmp= 1; cmp= 1;
break; break;
...@@ -418,6 +419,9 @@ void *tree_search_key(TREE *tree, const void *key, ...@@ -418,6 +419,9 @@ void *tree_search_key(TREE *tree, const void *key,
case HA_READ_BEFORE_KEY: case HA_READ_BEFORE_KEY:
*last_pos= last_right_step_parent; *last_pos= last_right_step_parent;
break; break;
case HA_READ_KEY_OR_PREV:
*last_pos= last_equal_element ? last_equal_element : last_right_step_parent;
break;
default: default:
return NULL; return NULL;
} }
......
sql/handler.cc
View file @ 505c663a
...@@ -2724,7 +2724,10 @@ void handler::print_error(int error, myf errflag) ...@@ -2724,7 +2724,10 @@ void handler::print_error(int error, myf errflag)
textno=ER_DUP_UNIQUE; textno=ER_DUP_UNIQUE;
break; break;
case HA_ERR_RECORD_CHANGED: case HA_ERR_RECORD_CHANGED:
SET_FATAL_ERROR; /*
This is not fatal error when using HANDLER interface
SET_FATAL_ERROR;
*/
textno=ER_CHECKREAD; textno=ER_CHECKREAD;
break; break;
case HA_ERR_CRASHED: case HA_ERR_CRASHED:
......
sql/handler.h
View file @ 505c663a
...@@ -1593,6 +1593,7 @@ public: ...@@ -1593,6 +1593,7 @@ public:
{ return(NULL);} /* gets tablespace name from handler */ { return(NULL);} /* gets tablespace name from handler */
/** used in ALTER TABLE; 1 if changing storage engine is allowed */ /** used in ALTER TABLE; 1 if changing storage engine is allowed */
virtual bool can_switch_engines() { return 1; } virtual bool can_switch_engines() { return 1; }
virtual int can_continue_handler_scan() { return 0; }
/** used in REPLACE; is > 0 if table is referred by a FOREIGN KEY */ /** used in REPLACE; is > 0 if table is referred by a FOREIGN KEY */
virtual int get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) virtual int get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list)
{ return 0; } { return 0; }
......
sql/sql_handler.cc
View file @ 505c663a
...@@ -548,6 +548,12 @@ retry: ...@@ -548,6 +548,12 @@ retry:
mode= RLAST; mode= RLAST;
} }
} }
else if (table->file->inited != handler::RND)
{
/* Convert RNEXT to RFIRST if we haven't started row scan */
if (mode == RNEXT)
mode= RFIRST;
}
if (insert_fields(thd, &thd->lex->select_lex.context, if (insert_fields(thd, &thd->lex->select_lex.context,
tables->db, tables->alias, &it, 0)) tables->db, tables->alias, &it, 0))
...@@ -569,6 +575,8 @@ retry: ...@@ -569,6 +575,8 @@ retry:
case RNEXT: case RNEXT:
if (table->file->inited != handler::NONE) if (table->file->inited != handler::NONE)
{ {
if ((error= table->file->can_continue_handler_scan()))
break;
if (keyname) if (keyname)
{ {
/* Check if we read from the same index. */ /* Check if we read from the same index. */
...@@ -603,6 +611,8 @@ retry: ...@@ -603,6 +611,8 @@ retry:
DBUG_ASSERT((uint) keyno == table->file->get_index()); DBUG_ASSERT((uint) keyno == table->file->get_index());
if (table->file->inited != handler::NONE) if (table->file->inited != handler::NONE)
{ {
if ((error= table->file->can_continue_handler_scan()))
break;
error=table->file->index_prev(table->record[0]); error=table->file->index_prev(table->record[0]);
break; break;
} }
...@@ -673,8 +683,11 @@ retry: ...@@ -673,8 +683,11 @@ retry:
continue; continue;
if (error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE) if (error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)
{ {
sql_print_error("mysql_ha_read: Got error %d when reading table '%s'", /* Don't give error in the log file for some expected problems */
error, tables->table_name); if (error != HA_ERR_RECORD_CHANGED && error != HA_ERR_WRONG_COMMAND)
sql_print_error("mysql_ha_read: Got error %d when reading "
"table '%s'",
error, tables->table_name);
table->file->print_error(error,MYF(0)); table->file->print_error(error,MYF(0));
goto err; goto err;
} }
......
storage/maria/ma_extra.c
View file @ 505c663a
...@@ -50,7 +50,7 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function, ...@@ -50,7 +50,7 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function,
switch (function) { switch (function) {
case HA_EXTRA_RESET_STATE: /* Reset state (don't free buffers) */ case HA_EXTRA_RESET_STATE: /* Reset state (don't free buffers) */
info->lastinx= 0; /* Use first index as def */ info->lastinx= ~0; /* Detect index changes */
info->last_search_keypage= info->cur_row.lastpos= HA_OFFSET_ERROR; info->last_search_keypage= info->cur_row.lastpos= HA_OFFSET_ERROR;
info->page_changed= 1; info->page_changed= 1;
/* Next/prev gives first/last */ /* Next/prev gives first/last */
...@@ -545,7 +545,7 @@ int maria_reset(MARIA_HA *info) ...@@ -545,7 +545,7 @@ int maria_reset(MARIA_HA *info)
#endif #endif
info->opt_flag&= ~(KEY_READ_USED | REMEMBER_OLD_POS); info->opt_flag&= ~(KEY_READ_USED | REMEMBER_OLD_POS);
info->quick_mode= 0; info->quick_mode= 0;
info->lastinx= 0; /* Use first index as def */ info->lastinx= ~0; /* detect index changes */
info->last_search_keypage= info->cur_row.lastpos= HA_OFFSET_ERROR; info->last_search_keypage= info->cur_row.lastpos= HA_OFFSET_ERROR;
info->page_changed= 1; info->page_changed= 1;
info->update= ((info->update & HA_STATE_CHANGED) | HA_STATE_NEXT_FOUND | info->update= ((info->update & HA_STATE_CHANGED) | HA_STATE_NEXT_FOUND |
......
storage/maria/ma_ft_boolean_search.c
View file @ 505c663a
...@@ -356,7 +356,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) ...@@ -356,7 +356,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
{ {
ftbw->key_root=info->s->state.key_root[ftb->keynr]; ftbw->key_root=info->s->state.key_root[ftb->keynr];
ftbw->keyinfo=info->s->keyinfo+ftb->keynr; ftbw->keyinfo=info->s->keyinfo+ftb->keynr;
key.keyinfo= ftbw->keyinfo; info->last_key.keyinfo= key.keyinfo= ftbw->keyinfo;
key.data= ftbw->word; key.data= ftbw->word;
key.data_length= ftbw->len; key.data_length= ftbw->len;
key.ref_length= 0; key.ref_length= 0;
...@@ -380,7 +380,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) ...@@ -380,7 +380,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
max_docid); max_docid);
} }
key.keyinfo= ftbw->keyinfo; info->last_key.keyinfo= key.keyinfo= ftbw->keyinfo;
key.data= lastkey_buf; key.data= lastkey_buf;
key.data_length= USE_WHOLE_KEY; key.data_length= USE_WHOLE_KEY;
key.ref_length= 0; key.ref_length= 0;
......
storage/maria/ma_open.c
View file @ 505c663a
...@@ -130,6 +130,8 @@ static MARIA_HA *maria_clone_internal(MARIA_SHARE *share, const char *name, ...@@ -130,6 +130,8 @@ static MARIA_HA *maria_clone_internal(MARIA_SHARE *share, const char *name,
info.s=share; info.s=share;
info.cur_row.lastpos= HA_OFFSET_ERROR; info.cur_row.lastpos= HA_OFFSET_ERROR;
/* Impossible first index to force initialization in _ma_check_index() */
info.lastinx= ~0;
info.update= (short) (HA_STATE_NEXT_FOUND+HA_STATE_PREV_FOUND); info.update= (short) (HA_STATE_NEXT_FOUND+HA_STATE_PREV_FOUND);
info.opt_flag=READ_CHECK_USED; info.opt_flag=READ_CHECK_USED;
info.this_unique= (ulong) info.dfile.file; /* Uniq number in process */ info.this_unique= (ulong) info.dfile.file; /* Uniq number in process */
......
storage/maria/ma_rkey.c
View file @ 505c663a
...@@ -43,7 +43,7 @@ int maria_rkey(MARIA_HA *info, uchar *buf, int inx, const uchar *key_data, ...@@ -43,7 +43,7 @@ int maria_rkey(MARIA_HA *info, uchar *buf, int inx, const uchar *key_data,
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED); info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
info->last_key_func= search_flag; info->last_key_func= search_flag;
keyinfo= share->keyinfo + inx; keyinfo= info->last_key.keyinfo;
key_buff= info->lastkey_buff+info->s->base.max_key_length; key_buff= info->lastkey_buff+info->s->base.max_key_length;
......
storage/maria/ma_rnext.c
View file @ 505c663a
...@@ -30,6 +30,7 @@ int maria_rnext(MARIA_HA *info, uchar *buf, int inx) ...@@ -30,6 +30,7 @@ int maria_rnext(MARIA_HA *info, uchar *buf, int inx)
uint flag; uint flag;
MARIA_SHARE *share= info->s; MARIA_SHARE *share= info->s;
MARIA_KEYDEF *keyinfo; MARIA_KEYDEF *keyinfo;
uint update_mask= HA_STATE_NEXT_FOUND;
DBUG_ENTER("maria_rnext"); DBUG_ENTER("maria_rnext");
if ((inx = _ma_check_index(info,inx)) < 0) if ((inx = _ma_check_index(info,inx)) < 0)
...@@ -61,6 +62,20 @@ int maria_rnext(MARIA_HA *info, uchar *buf, int inx) ...@@ -61,6 +62,20 @@ int maria_rnext(MARIA_HA *info, uchar *buf, int inx)
error= _ma_search_first(info, keyinfo, share->state.key_root[inx]); error= _ma_search_first(info, keyinfo, share->state.key_root[inx]);
break; break;
} }
/*
"search first" failed. This means we have no pivot for
"search next", or in other words MI_INFO::lastkey is
likely uninitialized.
Normally SQL layer would never request "search next" if
"search first" failed. But HANDLER may do anything.
As mi_rnext() without preceeding mi_rkey()/mi_rfirst()
equals to mi_rfirst(), we must restore original state
as if failing mi_rfirst() was not called.
*/
if (error)
update_mask|= HA_STATE_PREV_FOUND;
} }
else else
{ {
...@@ -104,7 +119,7 @@ int maria_rnext(MARIA_HA *info, uchar *buf, int inx) ...@@ -104,7 +119,7 @@ int maria_rnext(MARIA_HA *info, uchar *buf, int inx)
/* Don't clear if database-changed */ /* Don't clear if database-changed */
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED); info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
info->update|= HA_STATE_NEXT_FOUND; info->update|= update_mask;
if (error) if (error)
{ {
......
storage/maria/ma_rsame.c
View file @ 505c663a
...@@ -36,7 +36,7 @@ int maria_rsame(MARIA_HA *info, uchar *record, int inx) ...@@ -36,7 +36,7 @@ int maria_rsame(MARIA_HA *info, uchar *record, int inx)
{ {
DBUG_ENTER("maria_rsame"); DBUG_ENTER("maria_rsame");
if (inx != -1 && ! maria_is_key_active(info->s->state.key_map, inx)) if (inx >= 0 && !_ma_check_index(info, inx))
{ {
DBUG_PRINT("error", ("wrong index usage")); DBUG_PRINT("error", ("wrong index usage"));
DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX); DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX);
...@@ -55,8 +55,7 @@ int maria_rsame(MARIA_HA *info, uchar *record, int inx) ...@@ -55,8 +55,7 @@ int maria_rsame(MARIA_HA *info, uchar *record, int inx)
if (inx >= 0) if (inx >= 0)
{ {
MARIA_KEYDEF *keyinfo= info->s->keyinfo + inx; MARIA_KEYDEF *keyinfo= info->last_key.keyinfo;
info->lastinx= inx;
(*keyinfo->make_key)(info, &info->last_key, (uint) inx, (*keyinfo->make_key)(info, &info->last_key, (uint) inx,
info->lastkey_buff, record, info->lastkey_buff, record,
info->cur_row.lastpos, info->cur_row.lastpos,
......
storage/maria/ma_search.c
View file @ 505c663a
...@@ -38,6 +38,8 @@ int _ma_check_index(MARIA_HA *info, int inx) ...@@ -38,6 +38,8 @@ int _ma_check_index(MARIA_HA *info, int inx)
if (info->lastinx != inx) /* Index changed */ if (info->lastinx != inx) /* Index changed */
{ {
info->lastinx = inx; info->lastinx = inx;
info->last_key.keyinfo= info->s->keyinfo + inx;
info->last_key.flag= 0;
info->page_changed=1; info->page_changed=1;
info->update= ((info->update & (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED)) | info->update= ((info->update & (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED)) |
HA_STATE_NEXT_FOUND | HA_STATE_PREV_FOUND); HA_STATE_NEXT_FOUND | HA_STATE_PREV_FOUND);
...@@ -180,7 +182,6 @@ static int _ma_search_no_save(register MARIA_HA *info, MARIA_KEY *key, ...@@ -180,7 +182,6 @@ static int _ma_search_no_save(register MARIA_HA *info, MARIA_KEY *key,
} }
} }
info->last_key.keyinfo= keyinfo;
if ((nextflag & (SEARCH_SMALLER | SEARCH_LAST)) && flag != 0) if ((nextflag & (SEARCH_SMALLER | SEARCH_LAST)) && flag != 0)
{ {
uint not_used[2]; uint not_used[2];
...@@ -1696,7 +1697,7 @@ int _ma_search_next(register MARIA_HA *info, MARIA_KEY *key, ...@@ -1696,7 +1697,7 @@ int _ma_search_next(register MARIA_HA *info, MARIA_KEY *key,
} }
tmp_key.data= lastkey; tmp_key.data= lastkey;
info->last_key.keyinfo= tmp_key.keyinfo= keyinfo; tmp_key.keyinfo= keyinfo;
if (nextflag & SEARCH_BIGGER) /* Next key */ if (nextflag & SEARCH_BIGGER) /* Next key */
{ {
...@@ -1778,8 +1779,6 @@ int _ma_search_first(MARIA_HA *info, MARIA_KEYDEF *keyinfo, ...@@ -1778,8 +1779,6 @@ int _ma_search_first(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
first_pos= page.buff + share->keypage_header + page.node; first_pos= page.buff + share->keypage_header + page.node;
} while ((pos= _ma_kpos(page.node, first_pos)) != HA_OFFSET_ERROR); } while ((pos= _ma_kpos(page.node, first_pos)) != HA_OFFSET_ERROR);
info->last_key.keyinfo= keyinfo;
if (!(*keyinfo->get_key)(&info->last_key, page.flag, page.node, &first_pos)) if (!(*keyinfo->get_key)(&info->last_key, page.flag, page.node, &first_pos))
DBUG_RETURN(-1); /* Crashed */ DBUG_RETURN(-1); /* Crashed */
...@@ -1830,8 +1829,6 @@ int _ma_search_last(MARIA_HA *info, MARIA_KEYDEF *keyinfo, ...@@ -1830,8 +1829,6 @@ int _ma_search_last(MARIA_HA *info, MARIA_KEYDEF *keyinfo,
end_of_page= page.buff + page.size; end_of_page= page.buff + page.size;
} while ((pos= _ma_kpos(page.node, end_of_page)) != HA_OFFSET_ERROR); } while ((pos= _ma_kpos(page.node, end_of_page)) != HA_OFFSET_ERROR);
info->last_key.keyinfo= keyinfo;
if (!_ma_get_last_key(&info->last_key, &page, end_of_page)) if (!_ma_get_last_key(&info->last_key, &page, end_of_page))
DBUG_RETURN(-1); DBUG_RETURN(-1);
info->cur_row.lastpos= _ma_row_pos_from_key(&info->last_key); info->cur_row.lastpos= _ma_row_pos_from_key(&info->last_key);
......
storage/maria/ma_unique.c
View file @ 505c663a
...@@ -43,6 +43,7 @@ my_bool _ma_check_unique(MARIA_HA *info, MARIA_UNIQUEDEF *def, uchar *record, ...@@ -43,6 +43,7 @@ my_bool _ma_check_unique(MARIA_HA *info, MARIA_UNIQUEDEF *def, uchar *record,
/* The above changed info->lastkey_buff2. Inform maria_rnext_same(). */ /* The above changed info->lastkey_buff2. Inform maria_rnext_same(). */
info->update&= ~HA_STATE_RNEXT_SAME; info->update&= ~HA_STATE_RNEXT_SAME;
info->last_key.keyinfo= keyinfo;
DBUG_ASSERT(key.data_length == MARIA_UNIQUE_HASH_LENGTH); DBUG_ASSERT(key.data_length == MARIA_UNIQUE_HASH_LENGTH);
if (_ma_search(info, &key, SEARCH_FIND, info->s->state.key_root[def->key])) if (_ma_search(info, &key, SEARCH_FIND, info->s->state.key_root[def->key]))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7