mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct cursor protocol tests main.{loaddata,grant_plugin} & innodb_fts.fulltext

Browse source 
Cursor protocol cannot handle select... into.

Disable this on loaddata.

For the grant_plugin/innodb_fts.fulltext changed
the tests to use a temporary table rather than a
user variable.
This commit is contained in:
Daniel Black 2024-11-21 16:51:41 +11:00
parent 2c89fe7ea6
commit b414eca98d
5 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mysql-test/main/grant_plugin.result
View file

@ -4,14 +4,12 @@
install soname 'auth_0x0100';
CREATE USER foo@localhost IDENTIFIED VIA auth_0x0100;
uninstall plugin auth_0x0100;
select Priv from mysql.global_priv where User = "foo" and host="localhost"
into @priv;
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
create table t as select Priv from mysql.global_priv where User = "foo" and host="localhost";
SET PASSWORD FOR foo@localhost = "1111";
ERROR HY000: Plugin 'auth_0x0100' is not loaded
select Priv = @priv as "Nothing changed" from mysql.global_priv where User = "foo" and host="localhost";
select global_priv.Priv = t.Priv as "Nothing changed" from mysql.global_priv join t where User = "foo" and host="localhost";
Nothing changed
1
drop table t;
DROP USER foo@localhost;
# End of 10.5 tests

7
mysql-test/main/grant_plugin.test
View file

@ -13,11 +13,12 @@ install soname 'auth_0x0100';
CREATE USER foo@localhost IDENTIFIED VIA auth_0x0100;
uninstall plugin auth_0x0100;
select Priv from mysql.global_priv where User = "foo" and host="localhost"
into @priv;
create table t as select Priv from mysql.global_priv where User = "foo" and host="localhost";
--error ER_PLUGIN_IS_NOT_LOADED
SET PASSWORD FOR foo@localhost = "1111";
select Priv = @priv as "Nothing changed" from mysql.global_priv where User = "foo" and host="localhost";
select global_priv.Priv = t.Priv as "Nothing changed" from mysql.global_priv join t where User = "foo" and host="localhost";
drop table t;
DROP USER foo@localhost;

4
mysql-test/main/loaddata.test
View file

@ -843,10 +843,12 @@ CREATE OR REPLACE TABLE t1 (
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
INSERT INTO t1 VALUES (GeomFromText('POINT(37.646944 -75.761111)'));
--disable_cursor_protocol
--disable_ps2_protocol
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t1.tsv' FROM t1;
--enable_ps2_protocol
--enable_cursor_protocol
CREATE OR REPLACE TABLE t2 LIKE t1;
@ -863,10 +865,12 @@ CREATE OR REPLACE TABLE t1 (
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
INSERT INTO t1 VALUES (GeomFromText('POINT(37.646944 -75.761111)'),"їєі");
--disable_cursor_protocol
--disable_ps2_protocol
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t1.tsv' FROM t1;
--enable_ps2_protocol
--enable_cursor_protocol
CREATE OR REPLACE TABLE t2 LIKE t1;

9
mysql-test/suite/innodb_fts/r/fulltext.result
View file

@ -794,10 +794,10 @@ title VARCHAR(200), book VARCHAR(200),
FULLTEXT fidx(title)) ENGINE = InnoDB;
INSERT INTO t1(title) VALUES('database');
ALTER TABLE t1 DROP INDEX fidx;
select space into @common_space from information_schema.innodb_sys_tables where name like "test/FTS_%_CONFIG";
create table t2 as select space from information_schema.innodb_sys_tables where name like "test/FTS_%_CONFIG";
ALTER TABLE t1 ADD FULLTEXT fidx_1(book);
select space=@common_space from information_schema.innodb_sys_tables where name like "test/FTS_%_CONFIG";
space=@common_space
select i_s.space=t2.space from information_schema.innodb_sys_tables i_s join t2 where name like "test/FTS_%_CONFIG";
i_s.space=t2.space
1
SHOW CREATE TABLE t1;
Table Create Table
@ -808,4 +808,5 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`ID`),
FULLTEXT KEY `fidx_1` (`book`)
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
DROP TABLE t1;
DROP TABLE t1, t2;
# End of 10.5 tests

8
mysql-test/suite/innodb_fts/t/fulltext.test
View file

@ -814,8 +814,10 @@ CREATE TABLE t1 (
FULLTEXT fidx(title)) ENGINE = InnoDB;
INSERT INTO t1(title) VALUES('database');
ALTER TABLE t1 DROP INDEX fidx;
select space into @common_space from information_schema.innodb_sys_tables where name like "test/FTS_%_CONFIG";
create table t2 as select space from information_schema.innodb_sys_tables where name like "test/FTS_%_CONFIG";
ALTER TABLE t1 ADD FULLTEXT fidx_1(book);
select space=@common_space from information_schema.innodb_sys_tables where name like "test/FTS_%_CONFIG";
select i_s.space=t2.space from information_schema.innodb_sys_tables i_s join t2 where name like "test/FTS_%_CONFIG";
SHOW CREATE TABLE t1;
DROP TABLE t1;
DROP TABLE t1, t2;
--echo # End of 10.5 tests