1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-36452 MDEV-35452 Fix udf output temp field name in spider tests with --view-protocol

Browse Source
This commit is contained in:
Yuchen Pei 2025-04-02 14:28:10 +11:00
parent 25f1e6f565
commit 0f7c9146cf
No known key found for this signature in database
GPG Key ID: 3DD1B35105743563
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/spider/mysql-test/spider/bugfix/include/direct_sql_with_comma_pwd_init.inc
View File

@ -6,6 +6,6 @@
--enable_query_log
--enable_warnings
let $DIRECT_SQL_COMMAND=
SELECT spider_direct_sql('SELECT 22', 'tmp_a', 'srv "s_2_1", database "test", password "pass,1234", user "tu"');
SELECT spider_direct_sql('SELECT 22', 'tmp_a', 'srv "s_2_1", database "test", password "pass,1234", user "tu"') as exp;
--connection child2_1
GRANT ALL ON *.* TO tu@'%' IDENTIFIED BY 'pass,1234';

2
storage/spider/mysql-test/spider/bugfix/include/direct_sql_with_tmp_table_init.inc
View File

@ -6,4 +6,4 @@
--enable_query_log
--enable_warnings
let $DIRECT_SQL_COMMAND=
SELECT spider_direct_sql('SELECT 22', 'tmp_a', 'srv "s_2_1", database "test"');
SELECT spider_direct_sql('SELECT 22', 'tmp_a', 'srv "s_2_1", database "test"') as exp;

4
storage/spider/mysql-test/spider/bugfix/r/direct_sql_with_comma_pwd.result
View File

@ -15,8 +15,8 @@ CREATE TEMPORARY TABLE tmp_a (
pkey int NOT NULL,
PRIMARY KEY (pkey)
) MASTER_1_ENGINE2
SELECT spider_direct_sql('SELECT 22', 'tmp_a', 'srv "s_2_1", database "test", password "pass,1234", user "tu"');
spider_direct_sql('SELECT 22', 'tmp_a', 'srv "s_2_1", database "test", password "pass,1234", user "tu"')
SELECT spider_direct_sql('SELECT 22', 'tmp_a', 'srv "s_2_1", database "test", password "pass,1234", user "tu"') as exp;
exp
1
SELECT pkey FROM tmp_a;
pkey

4
storage/spider/mysql-test/spider/bugfix/r/direct_sql_with_tmp_table.result
View File

@ -13,8 +13,8 @@ CREATE TEMPORARY TABLE tmp_a (
pkey int NOT NULL,
PRIMARY KEY (pkey)
) MASTER_1_ENGINE2
SELECT spider_direct_sql('SELECT 22', 'tmp_a', 'srv "s_2_1", database "test"');
spider_direct_sql('SELECT 22', 'tmp_a', 'srv "s_2_1", database "test"')
SELECT spider_direct_sql('SELECT 22', 'tmp_a', 'srv "s_2_1", database "test"') as exp;
exp
1
SELECT pkey FROM tmp_a;
pkey

4
storage/spider/mysql-test/spider/bugfix/r/udf_mysql_func_early.result
View File

@ -31,8 +31,8 @@ CREATE TABLE tbl_a (
a INT
) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
create temporary table results (a int);
SELECT SPIDER_DIRECT_SQL('select * from tbl_a', 'results', 'srv "s_2_1", database "auto_test_remote"');
SPIDER_DIRECT_SQL('select * from tbl_a', 'results', 'srv "s_2_1", database "auto_test_remote"')
SELECT SPIDER_DIRECT_SQL('select * from tbl_a', 'results', 'srv "s_2_1", database "auto_test_remote"') as exp;
exp
1
select * from results;
a

4
storage/spider/mysql-test/spider/bugfix/r/udf_mysql_func_early_init_file.result
View File

@ -31,8 +31,8 @@ CREATE TABLE tbl_a (
a INT
) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
create temporary table results (a int);
SELECT SPIDER_DIRECT_SQL('select * from tbl_a', 'results', 'srv "s_2_1", database "auto_test_remote"');
SPIDER_DIRECT_SQL('select * from tbl_a', 'results', 'srv "s_2_1", database "auto_test_remote"')
SELECT SPIDER_DIRECT_SQL('select * from tbl_a', 'results', 'srv "s_2_1", database "auto_test_remote"') as exp;
exp
1
select * from results;
a

2
storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early.test
View File

@ -37,7 +37,7 @@ eval CREATE TABLE tbl_a (
create temporary table results (a int);
--disable_ps_protocol
SELECT SPIDER_DIRECT_SQL('select * from tbl_a', 'results', 'srv "s_2_1", database "auto_test_remote"');
SELECT SPIDER_DIRECT_SQL('select * from tbl_a', 'results', 'srv "s_2_1", database "auto_test_remote"') as exp;
--enable_ps_protocol
select * from results;

12
storage/spider/mysql-test/spider/feature/r/pushdown_case.result
View File

@ -11,11 +11,11 @@ create table t2 (c int);
create table t1 (c int) ENGINE=Spider
COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"';
insert into t1 values (42), (3), (848), (100);
explain select case c when 3 then "three" when 42 then "answer" else "other" end from t1;
explain select case c when 3 then "three" when 42 then "answer" else "other" end as exp from t1;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Storage engine handles GROUP BY
select case c when 3 then "three" when 42 then "answer" else "other" end from t1;
case c when 3 then "three" when 42 then "answer" else "other" end
select case c when 3 then "three" when 42 then "answer" else "other" end as exp from t1;
exp
answer
three
other
@ -29,11 +29,11 @@ answer
three
NULL
NULL
explain select case when c = 3 then "three" when c = 42 then "answer" else "other" end from t1;
explain select case when c = 3 then "three" when c = 42 then "answer" else "other" end as exp from t1;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Storage engine handles GROUP BY
select case when c = 3 then "three" when c = 42 then "answer" else "other" end from t1;
case when c = 3 then "three" when c = 42 then "answer" else "other" end
select case when c = 3 then "three" when c = 42 then "answer" else "other" end as exp from t1;
exp
answer
three
other

4
storage/spider/mysql-test/spider/feature/t/pushdown_case.test
View File

@ -16,7 +16,7 @@ insert into t1 values (42), (3), (848), (100);
# everything
let $query=
select case c when 3 then "three" when 42 then "answer" else "other" end from t1;
select case c when 3 then "three" when 42 then "answer" else "other" end as exp from t1;
eval explain $query;
eval $query;
@ -28,7 +28,7 @@ eval $query;
# no value
let $query=
select case when c = 3 then "three" when c = 42 then "answer" else "other" end from t1;
select case when c = 3 then "three" when c = 42 then "answer" else "other" end as exp from t1;
eval explain $query;
eval $query;