Merge tag '11.4' into 11.6

MariaDB 11.4.4 release

mysql-test/suite/handler/aria.result

@@ -400,7 +400,7 @@ create table t1(a int, index using btree (a));
 insert into t1 values (1), (2), (3);
 handler t1 open;
 handler t1 read a=(W);
-ERROR 42S22: Unknown column 'W' in 'field list'
+ERROR 42S22: Unknown column 'W' in 'HANDLER ... READ'
 handler t1 read a=(a);
 ERROR HY000: Incorrect arguments to HANDLER ... READ
 drop table t1;
@@ -597,11 +597,11 @@ 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'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 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'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias close;
 drop table t1;
 create temporary table t1 (a int, b char(1), key a using btree (a), key b using btree (a,b));

mysql-test/suite/handler/heap.result

@@ -400,7 +400,7 @@ create table t1(a int, index using btree (a));
 insert into t1 values (1), (2), (3);
 handler t1 open;
 handler t1 read a=(W);
-ERROR 42S22: Unknown column 'W' in 'field list'
+ERROR 42S22: Unknown column 'W' in 'HANDLER ... READ'
 handler t1 read a=(a);
 ERROR HY000: Incorrect arguments to HANDLER ... READ
 drop table t1;
@@ -597,11 +597,11 @@ 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'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 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'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias close;
 drop table t1;
 create temporary table t1 (a int, b char(1), key a using btree (a), key b using btree (a,b));

mysql-test/suite/handler/innodb.result

@@ -400,7 +400,7 @@ create table t1(a int, index using btree (a));
 insert into t1 values (1), (2), (3);
 handler t1 open;
 handler t1 read a=(W);
-ERROR 42S22: Unknown column 'W' in 'field list'
+ERROR 42S22: Unknown column 'W' in 'HANDLER ... READ'
 handler t1 read a=(a);
 ERROR HY000: Incorrect arguments to HANDLER ... READ
 drop table t1;
@@ -598,11 +598,11 @@ 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'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 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'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias close;
 drop table t1;
 create temporary table t1 (a int, b char(1), key a using btree (a), key b using btree (a,b));

mysql-test/suite/handler/interface.result

@@ -338,9 +338,9 @@ CREATE TABLE t1 (g GEOMETRY NOT NULL, SPATIAL gi(g));
 INSERT INTO t1 VALUES (POINT(0,0));
 HANDLER t1 OPEN AS h;
 HANDLER h READ `gi`= (10);
-ERROR HY000: SPATIAL index `gi` does not support this operation
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 HANDLER h READ `gi`> (10);
-ERROR HY000: SPATIAL index `gi` does not support this operation
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 HANDLER h CLOSE;
 DROP TABLE t1;
 CREATE TABLE t1 (w VARCHAR(100), FULLTEXT fk(w));
@@ -352,3 +352,12 @@ HANDLER h READ `fk`> (10);
 ERROR HY000: FULLTEXT index `fk` does not support this operation
 HANDLER h CLOSE;
 DROP TABLE t1;
+#
+# MDEV-35082 HANDLER with FULLTEXT keys is not always rejected
+#
+create table t (a int primary key, v text not null, fulltext(v));
+handler t open;
+handler t read v next;
+ERROR HY000: FULLTEXT index `v` does not support this operation
+drop table t;
+# End of 10.5 tests

mysql-test/suite/handler/interface.test

@@ -385,9 +385,9 @@ DROP TABLE t1;
 CREATE TABLE t1 (g GEOMETRY NOT NULL, SPATIAL gi(g));
 INSERT INTO t1 VALUES (POINT(0,0));
 HANDLER t1 OPEN AS h;
---error ER_KEY_DOESNT_SUPPORT
+--error ER_CANT_CREATE_GEOMETRY_OBJECT
 HANDLER h READ `gi`= (10);
---error ER_KEY_DOESNT_SUPPORT
+--error ER_CANT_CREATE_GEOMETRY_OBJECT
 HANDLER h READ `gi`> (10);
 HANDLER h CLOSE;
 DROP TABLE t1;
@@ -401,3 +401,14 @@ HANDLER h READ `fk`= (10);
 HANDLER h READ `fk`> (10);
 HANDLER h CLOSE;
 DROP TABLE t1;
+
+--echo #
+--echo # MDEV-35082 HANDLER with FULLTEXT keys is not always rejected
+--echo #
+create table t (a int primary key, v text not null, fulltext(v));
+handler t open;
+--error ER_KEY_DOESNT_SUPPORT
+handler t read v next;
+drop table t;
+
+--echo # End of 10.5 tests

mysql-test/suite/handler/myisam.result

@@ -400,7 +400,7 @@ create table t1(a int, index using btree (a));
 insert into t1 values (1), (2), (3);
 handler t1 open;
 handler t1 read a=(W);
-ERROR 42S22: Unknown column 'W' in 'field list'
+ERROR 42S22: Unknown column 'W' in 'HANDLER ... READ'
 handler t1 read a=(a);
 ERROR HY000: Incorrect arguments to HANDLER ... READ
 drop table t1;
@@ -597,11 +597,11 @@ 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'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 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'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias close;
 drop table t1;
 create temporary table t1 (a int, b char(1), key a using btree (a), key b using btree (a,b));