database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Code Activity

Merge branch 'bb-10.7-all-builders' into bb-10.8-all-builders

Browse Source
This commit is contained in:
Lena Startseva
2022-09-27 18:12:06 +07:00
parent 4345d93100 cee61e37b9
commit c5cc8a7a75
321 changed files with 2211 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
client/mysqltest.cc
View File

@ -119,6 +119,7 @@ static my_bool opt_mark_progress= 0;
static my_bool ps_protocol= 0, ps_protocol_enabled= 0; static my_bool ps_protocol= 0, ps_protocol_enabled= 0;
static my_bool sp_protocol= 0, sp_protocol_enabled= 0; static my_bool sp_protocol= 0, sp_protocol_enabled= 0;
static my_bool view_protocol= 0, view_protocol_enabled= 0; static my_bool view_protocol= 0, view_protocol_enabled= 0;
static my_bool service_connection_enabled= 1;
static my_bool cursor_protocol= 0, cursor_protocol_enabled= 0; static my_bool cursor_protocol= 0, cursor_protocol_enabled= 0;
static my_bool parsing_disabled= 0; static my_bool parsing_disabled= 0;
static my_bool display_result_vertically= FALSE, display_result_lower= FALSE, static my_bool display_result_vertically= FALSE, display_result_lower= FALSE,
@ -157,6 +158,7 @@ static struct property prop_list[] = {
{ &display_metadata, 0, 0, 0, "$ENABLED_METADATA" }, { &display_metadata, 0, 0, 0, "$ENABLED_METADATA" },
{ &ps_protocol_enabled, 0, 0, 0, "$ENABLED_PS_PROTOCOL" }, { &ps_protocol_enabled, 0, 0, 0, "$ENABLED_PS_PROTOCOL" },
{ &view_protocol_enabled, 0, 0, 0, "$ENABLED_VIEW_PROTOCOL"}, { &view_protocol_enabled, 0, 0, 0, "$ENABLED_VIEW_PROTOCOL"},
{ &service_connection_enabled, 0, 1, 0, "$ENABLED_SERVICE_CONNECTION"},
{ &disable_query_log, 0, 0, 1, "$ENABLED_QUERY_LOG" }, { &disable_query_log, 0, 0, 1, "$ENABLED_QUERY_LOG" },
{ &disable_result_log, 0, 0, 1, "$ENABLED_RESULT_LOG" }, { &disable_result_log, 0, 0, 1, "$ENABLED_RESULT_LOG" },
{ &disable_warnings, 0, 0, 1, "$ENABLED_WARNINGS" } { &disable_warnings, 0, 0, 1, "$ENABLED_WARNINGS" }
@ -172,6 +174,7 @@ enum enum_prop {
P_META, P_META,
P_PS, P_PS,
P_VIEW, P_VIEW,
P_CONN,
P_QUERY, P_QUERY,
P_RESULT, P_RESULT,
P_WARN, P_WARN,
@ -379,6 +382,7 @@ enum enum_commands {
Q_START_TIMER, Q_END_TIMER, Q_START_TIMER, Q_END_TIMER,
Q_CHARACTER_SET, Q_DISABLE_PS_PROTOCOL, Q_ENABLE_PS_PROTOCOL, Q_CHARACTER_SET, Q_DISABLE_PS_PROTOCOL, Q_ENABLE_PS_PROTOCOL,
Q_DISABLE_VIEW_PROTOCOL, Q_ENABLE_VIEW_PROTOCOL, Q_DISABLE_VIEW_PROTOCOL, Q_ENABLE_VIEW_PROTOCOL,
Q_DISABLE_SERVICE_CONNECTION, Q_ENABLE_SERVICE_CONNECTION,
Q_ENABLE_NON_BLOCKING_API, Q_DISABLE_NON_BLOCKING_API, Q_ENABLE_NON_BLOCKING_API, Q_DISABLE_NON_BLOCKING_API,
Q_DISABLE_RECONNECT, Q_ENABLE_RECONNECT, Q_DISABLE_RECONNECT, Q_ENABLE_RECONNECT,
Q_IF, Q_IF,
@ -472,6 +476,8 @@ const char *command_names[]=
"enable_ps_protocol", "enable_ps_protocol",
"disable_view_protocol", "disable_view_protocol",
"enable_view_protocol", "enable_view_protocol",
"disable_service_connection",
"enable_service_connection",
"enable_non_blocking_api", "enable_non_blocking_api",
"disable_non_blocking_api", "disable_non_blocking_api",
"disable_reconnect", "disable_reconnect",
@ -9029,25 +9035,30 @@ int util_query(MYSQL* org_mysql, const char* query){
MYSQL* mysql; MYSQL* mysql;
DBUG_ENTER("util_query"); DBUG_ENTER("util_query");
if(!(mysql= cur_con->util_mysql)) if (service_connection_enabled)
{ {
DBUG_PRINT("info", ("Creating util_mysql")); if(!(mysql= cur_con->util_mysql))
if (!(mysql= mysql_init(mysql))) {
die("Failed in mysql_init()"); DBUG_PRINT("info", ("Creating util_mysql"));
if (!(mysql= mysql_init(mysql)))
die("Failed in mysql_init()");
if (opt_connect_timeout) if (opt_connect_timeout)
mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT,
(void *) &opt_connect_timeout); (void *) &opt_connect_timeout);
/* enable local infile, in non-binary builds often disabled by default */ /* enable local infile, in non-binary builds often disabled by default */
mysql_options(mysql, MYSQL_OPT_LOCAL_INFILE, 0); mysql_options(mysql, MYSQL_OPT_LOCAL_INFILE, 0);
mysql_options(mysql, MYSQL_OPT_NONBLOCK, 0); mysql_options(mysql, MYSQL_OPT_NONBLOCK, 0);
safe_connect(mysql, "util", org_mysql->host, org_mysql->user, safe_connect(mysql, "util", org_mysql->host, org_mysql->user,
org_mysql->passwd, org_mysql->db, org_mysql->port, org_mysql->passwd, org_mysql->db, org_mysql->port,
org_mysql->unix_socket); org_mysql->unix_socket);
cur_con->util_mysql= mysql; cur_con->util_mysql= mysql;
}
} }
else
mysql= org_mysql;
int ret= mysql_query(mysql, query); int ret= mysql_query(mysql, query);
DBUG_RETURN(ret); DBUG_RETURN(ret);
@ -9196,7 +9207,10 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
Collect warnings from create of the view that should otherwise Collect warnings from create of the view that should otherwise
have been produced when the SELECT was executed have been produced when the SELECT was executed
*/ */
append_warnings(&ds_warnings, cur_con->util_mysql); append_warnings(&ds_warnings,
service_connection_enabled ?
cur_con->util_mysql :
mysql);
} }
dynstr_free(&query_str); dynstr_free(&query_str);
@ -10250,6 +10264,14 @@ int main(int argc, char **argv)
case Q_ENABLE_VIEW_PROTOCOL: case Q_ENABLE_VIEW_PROTOCOL:
set_property(command, P_VIEW, view_protocol); set_property(command, P_VIEW, view_protocol);
break; break;
case Q_DISABLE_SERVICE_CONNECTION:
set_property(command, P_CONN, 0);
/* Close only util connections */
close_util_connections();
break;
case Q_ENABLE_SERVICE_CONNECTION:
set_property(command, P_CONN, view_protocol);
break;
case Q_DISABLE_NON_BLOCKING_API: case Q_DISABLE_NON_BLOCKING_API:
non_blocking_api_enabled= 0; non_blocking_api_enabled= 0;
break; break;

20
mysql-test/include/concurrent.inc
View File

@ -55,6 +55,7 @@ GRANT USAGE ON test.* TO mysqltest@localhost;
--echo ** --echo **
--echo ** two UPDATE's running and both changing distinct result sets --echo ** two UPDATE's running and both changing distinct result sets
--echo ** --echo **
--disable_view_protocol
connect (thread1, localhost, mysqltest,,); connect (thread1, localhost, mysqltest,,);
connection thread1; connection thread1;
--echo ** Set up table --echo ** Set up table
@ -140,7 +141,6 @@ GRANT USAGE ON test.* TO mysqltest@localhost;
connection default; connection default;
drop table t1; drop table t1;
--echo --echo
--echo ** --echo **
--echo ** two UPDATE's running and one changing result set --echo ** two UPDATE's running and one changing result set
@ -228,7 +228,7 @@ drop table t1;
connection default; connection default;
drop table t1; drop table t1;
--enable_view_protocol
--echo --echo
--echo ** --echo **
@ -306,8 +306,9 @@ drop table t1;
--echo ** Begin a new transaction on thread 2 --echo ** Begin a new transaction on thread 2
begin; begin;
--echo ** Select a range for update. --echo ** Select a range for update.
--disable_view_protocol
select * from t1 where tipo=2 FOR UPDATE; select * from t1 where tipo=2 FOR UPDATE;
--enable_view_protocol
connection thread1; connection thread1;
--echo ** Begin a new transaction on thread 1 --echo ** Begin a new transaction on thread 1
begin; begin;
@ -346,6 +347,7 @@ drop table t1;
--echo ** --echo **
--echo ** one UPDATE not changing result set and SELECT ... FOR UPDATE --echo ** one UPDATE not changing result set and SELECT ... FOR UPDATE
--echo ** --echo **
--disable_view_protocol
#connect (thread1, localhost, mysqltest,,); #connect (thread1, localhost, mysqltest,,);
connection thread1; connection thread1;
--echo ** Set up table --echo ** Set up table
@ -369,7 +371,6 @@ drop table t1;
begin; begin;
--echo ** Starting SELECT .. FOR UPDATE --echo ** Starting SELECT .. FOR UPDATE
select * from t1 where tipo=2 FOR UPDATE; select * from t1 where tipo=2 FOR UPDATE;
connection thread1; connection thread1;
--echo --echo
--echo ** Starting new transaction on thread 1 --echo ** Starting new transaction on thread 1
@ -439,14 +440,15 @@ drop table t1;
--echo ** Begin a new transaction on thread 2 --echo ** Begin a new transaction on thread 2
begin; begin;
select * from t1 where tipo=2 FOR UPDATE; select * from t1 where tipo=2 FOR UPDATE;
connection thread1; connection thread1;
--echo ** Begin a new transaction on thread 1 --echo ** Begin a new transaction on thread 1
begin; begin;
--echo ** Selecting a range for update by table scan will be blocked --echo ** Selecting a range for update by table scan will be blocked
--echo ** because of on-going transaction on thread 2. --echo ** because of on-going transaction on thread 2.
--disable_view_protocol
--error ER_LOCK_WAIT_TIMEOUT --error ER_LOCK_WAIT_TIMEOUT
select * from t1 where tipo=1 FOR UPDATE; select * from t1 where tipo=1 FOR UPDATE;
--enable_view_protocol
connection thread2; connection thread2;
--echo ** Table will be unchanged and the select command will not be --echo ** Table will be unchanged and the select command will not be
@ -469,7 +471,7 @@ drop table t1;
connection default; connection default;
drop table t1; drop table t1;
--enable_view_protocol
--echo --echo
--echo ** --echo **
@ -555,7 +557,7 @@ drop table t1;
# succeding update in the following thread. Also the used status variables '%lock%' and # succeding update in the following thread. Also the used status variables '%lock%' and
# 'innodb_deleted_rows' and infos in processlist where not sucessful. # 'innodb_deleted_rows' and infos in processlist where not sucessful.
sleep 1; sleep 1;
--disable_view_protocol
connection thread1; connection thread1;
begin; begin;
--echo ** Update on t1 will cause a table scan which will be blocked because --echo ** Update on t1 will cause a table scan which will be blocked because
@ -578,7 +580,7 @@ drop table t1;
reap; reap;
select * from t1; select * from t1;
send commit; send commit;
--enable_view_protocol
connection thread1; connection thread1;
commit; commit;

4
mysql-test/include/count_sessions.inc
View File

@ -18,4 +18,8 @@
# Created: 2009-01-14 mleich # Created: 2009-01-14 mleich
# #
# Tests will be skipped for the view protocol because the view protocol creates
# an additional util connection and other statistics data
-- source include/no_view_protocol.inc
let $count_sessions= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1); let $count_sessions= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1);

4
mysql-test/include/ctype_E05C.inc
View File

@ -81,6 +81,8 @@ DROP TABLE t1;
# even if character_set_connection is big5/cp932/gbk/sjis. # even if character_set_connection is big5/cp932/gbk/sjis.
# Note, the other 0x5C which is before 0xE05C is also treated as escape. # Note, the other 0x5C which is before 0xE05C is also treated as escape.
# #
#check after fix MDEV-29290
--disable_view_protocol
SET character_set_client=binary, character_set_results=binary; SET character_set_client=binary, character_set_results=binary;
SELECT @@character_set_client, @@character_set_connection, @@character_set_results; SELECT @@character_set_client, @@character_set_connection, @@character_set_results;
SELECT HEX('<EFBFBD>\['), HEX('\<5C>\['); SELECT HEX('<EFBFBD>\['), HEX('\<5C>\[');
@ -105,7 +107,7 @@ SHOW CREATE TABLE t1;
INSERT INTO t1 VALUES ('<EFBFBD>\['),('\<5C>\['); INSERT INTO t1 VALUES ('<EFBFBD>\['),('\<5C>\[');
SELECT HEX(a) FROM t1; SELECT HEX(a) FROM t1;
DROP TABLE t1; DROP TABLE t1;
--enable_view_protocol
--echo # Start of ctype_E05C.inc --echo # Start of ctype_E05C.inc

2
mysql-test/include/ctype_common.inc
View File

@ -67,10 +67,12 @@ drop table t1;
--echo # --echo #
--echo # MDEV-6134 SUBSTRING_INDEX returns wrong result for 8bit character sets when delimiter is not found --echo # MDEV-6134 SUBSTRING_INDEX returns wrong result for 8bit character sets when delimiter is not found
--echo # --echo #
--disable_service_connection
SET character_set_client=latin1; SET character_set_client=latin1;
SET character_set_connection= @test_character_set; SET character_set_connection= @test_character_set;
SET collation_connection= @test_collation; SET collation_connection= @test_collation;
SELECT COLLATION('.'), SUBSTRING_INDEX('.wwwmysqlcom', '.', -2) AS c1; SELECT COLLATION('.'), SUBSTRING_INDEX('.wwwmysqlcom', '.', -2) AS c1;
--enable_service_connection
# #
# Bug#27580 SPACE() function collation bug? # Bug#27580 SPACE() function collation bug?

3
mysql-test/include/ctype_datetime.inc
View File

@ -18,6 +18,8 @@ SET time_zone=default;
# TODO: remove "--disable_ps_protocol" when MDEV-5444 is fixed # TODO: remove "--disable_ps_protocol" when MDEV-5444 is fixed
--disable_ps_protocol --disable_ps_protocol
#remove "--disable_view_protocol" in 10.6 version
--disable_view_protocol
SELECT CHARSET('2013-11-15 00:41:28' - INTERVAL 7 DAY); SELECT CHARSET('2013-11-15 00:41:28' - INTERVAL 7 DAY);
SELECT COERCIBILITY('2013-11-15 00:41:28' - INTERVAL 7 DAY); SELECT COERCIBILITY('2013-11-15 00:41:28' - INTERVAL 7 DAY);
SELECT CHARSET(TIMESTAMP'2013-11-15 00:41:28' - INTERVAL 7 DAY); SELECT CHARSET(TIMESTAMP'2013-11-15 00:41:28' - INTERVAL 7 DAY);
@ -55,3 +57,4 @@ SELECT * FROM t1 WHERE t = CONCAT('2001-01-08 00:00:00',LEFT(RAND(),0)) - INTERV
SELECT * FROM t1 WHERE t < TIMESTAMP'2013-11-15 00:41:28' - INTERVAL 7 DAY; SELECT * FROM t1 WHERE t < TIMESTAMP'2013-11-15 00:41:28' - INTERVAL 7 DAY;
SELECT * FROM t1 WHERE t = TIMESTAMP'2001-01-08 00:00:00' - INTERVAL 7 DAY; SELECT * FROM t1 WHERE t = TIMESTAMP'2001-01-08 00:00:00' - INTERVAL 7 DAY;
DROP TABLE t1; DROP TABLE t1;
--enable_view_protocol

4
mysql-test/include/ctype_german.inc
View File

@ -46,6 +46,8 @@ INSERT INTO t1 VALUES (_latin1 0x9C), (_latin1 0x8C);
# #
# Check order # Check order
# #
#enable after fix MDEV-29290
--disable_view_protocol
select s1, hex(s1) from t1 order by s1, binary s1; select s1, hex(s1) from t1 order by s1, binary s1;
select group_concat(s1 order by binary s1) from t1 group by s1; select group_concat(s1 order by binary s1) from t1 group by s1;
@ -53,7 +55,7 @@ SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1); SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
drop table t1; drop table t1;
--enable_view_protocol
# #
# Check filesort for 'S' and "U+00DF SHARP S", # Check filesort for 'S' and "U+00DF SHARP S",

3
mysql-test/include/ctype_like_range_f1f2.inc
View File

@ -17,9 +17,12 @@ INSERT INTO t1 (a, b) VALUES (2, repeat(0xF1F2,10));
INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11)); INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11));
INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12)); INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12));
#check after fix MDEV-29290
--disable_view_protocol
# Check pattern (important for ucs2, utf16, utf32) # Check pattern (important for ucs2, utf16, utf32)
SELECT hex(concat(repeat(0xF1F2, 10), '%')); SELECT hex(concat(repeat(0xF1F2, 10), '%'));
--echo 3 rows expected --echo 3 rows expected
SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%'); SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%');
DROP TABLE t1; DROP TABLE t1;
--enable_view_protocol

4
mysql-test/include/ctype_myanmar.inc
View File

@ -1293,7 +1293,11 @@ INSERT INTO t1 (s1) VALUES
(_ucs2 0x101C1000103A10181000103A), (_ucs2 0x101C1000103A10181000103A),
(_ucs2 0x101C103910181000103A /* tea */); (_ucs2 0x101C103910181000103A /* tea */);
# enable view-protocol after fix MDEV-27871
--disable_view_protocol
SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) FROM t1 ORDER BY id; SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) FROM t1 ORDER BY id;
--enable_view_protocol
DROP TABLE t1; DROP TABLE t1;

5
mysql-test/include/ctype_numconv.inc
View File

@ -1,3 +1,7 @@
#remove this include after fix MDEV-27871
# maybe some tests need to be excluded separately after fix
--source include/no_view_protocol.inc
SET TIME_ZONE = _latin1 '+03:00'; SET TIME_ZONE = _latin1 '+03:00';
--echo # --echo #
@ -1631,6 +1635,7 @@ SELECT charset(@x), collation(@x);
--echo # --echo #
--echo # Bug#54916 GROUP_CONCAT + IFNULL truncates output --echo # Bug#54916 GROUP_CONCAT + IFNULL truncates output
--echo # --echo #
SELECT @@collation_connection; SELECT @@collation_connection;
# ENGINE=MYISAM is very important to make sure "SYSTEM" join type # ENGINE=MYISAM is very important to make sure "SYSTEM" join type
# is in use, which will create instances of Item_copy. # is in use, which will create instances of Item_copy.

5
mysql-test/include/ctype_pad.inc
View File

@ -52,13 +52,14 @@ DROP TABLE t1;
--echo # --echo #
--echo # IF, CASE, LEAST --echo # IF, CASE, LEAST
--echo # --echo #
#enable after fix MDEV-27871
--disable_view_protocol
eval SELECT IF('abc' COLLATE $coll = 'abc ', 'pad', 'nopad'); eval SELECT IF('abc' COLLATE $coll = 'abc ', 'pad', 'nopad');
eval SELECT CASE 'abc' COLLATE $coll WHEN 'abc ' THEN 'pad' ELSE 'nopad' END; eval SELECT CASE 'abc' COLLATE $coll WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
eval SELECT CASE WHEN 'abc' COLLATE $coll = 'abc ' THEN 'pad' ELSE 'nopad' END; eval SELECT CASE WHEN 'abc' COLLATE $coll = 'abc ' THEN 'pad' ELSE 'nopad' END;
eval SELECT HEX(LEAST('abc ' COLLATE $coll, 'abc ')); eval SELECT HEX(LEAST('abc ' COLLATE $coll, 'abc '));
eval SELECT HEX(GREATEST('abc ' COLLATE $coll, 'abc ')); eval SELECT HEX(GREATEST('abc ' COLLATE $coll, 'abc '));
--enable_view_protocol
--echo # --echo #
--echo # Collation mix --echo # Collation mix
--echo # --echo #

3
mysql-test/include/ctype_str_to_date.inc
View File

@ -3,7 +3,10 @@
--echo # --echo #
SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR)); SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
# enable view-protocol after fix MDEV-27871
--disable_view_protocol
SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR)); SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
--enable_view_protocol
CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0; CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0;
SHOW COLUMNS FROM t1; SHOW COLUMNS FROM t1;
INSERT INTO t1 VALUES (_utf8'2001÷01÷01',_utf8'%Y÷%m÷%d'); INSERT INTO t1 VALUES (_utf8'2001÷01÷01',_utf8'%Y÷%m÷%d');

3
mysql-test/include/ctype_unescape.inc
View File

@ -309,12 +309,15 @@ CALL p2();
--disable_warnings --disable_warnings
# All records marked with '[BAD]' mean that the string was unescaped # All records marked with '[BAD]' mean that the string was unescaped
# in a unexpected way, that means there is a bug in UNESCAPE() above. # in a unexpected way, that means there is a bug in UNESCAPE() above.
#check after fix MDEV-29290
--disable_view_protocol
SELECT HEX(a),HEX(b), SELECT HEX(a),HEX(b),
CONCAT(unescape_type(a,b), CONCAT(unescape_type(a,b),
wellformedness(a,b), wellformedness(a,b),
mysql_real_escape_string_generated(a), mysql_real_escape_string_generated(a),
IF(UNESCAPE(a)<>b,CONCAT('[BAD',HEX(UNESCAPE(a)),']'),'')) AS comment IF(UNESCAPE(a)<>b,CONCAT('[BAD',HEX(UNESCAPE(a)),']'),'')) AS comment
FROM t1 ORDER BY LENGTH(a),a; FROM t1 ORDER BY LENGTH(a),a;
--enable_view_protocol
--enable_warnings --enable_warnings
DROP TABLE t1; DROP TABLE t1;
DROP PROCEDURE p1; DROP PROCEDURE p1;

6
mysql-test/include/ctype_utf8mb4.inc
View File

@ -1,6 +1,12 @@
# #
# Tests with the utf8mb4 character set # Tests with the utf8mb4 character set
# #
# Tests will be skipped for the view protocol because the view protocol uses
# an additional util connection and don't use for this nessesary configurations
# Also need to resolve MDEV-27871
-- source include/no_view_protocol.inc
--source include/default_optimizer_switch.inc --source include/default_optimizer_switch.inc
--disable_warnings --disable_warnings
drop table if exists t1,t2; drop table if exists t1,t2;

10
mysql-test/include/deadlock.inc
View File

@ -9,7 +9,7 @@
# old name was t/innodb-deadlock.test # old name was t/innodb-deadlock.test
# main code went into include/deadlock.inc # main code went into include/deadlock.inc
# #
--disable_service_connection
connect (con1,localhost,root,,); connect (con1,localhost,root,,);
connect (con2,localhost,root,,); connect (con2,localhost,root,,);
@ -20,7 +20,7 @@ drop table if exists t1,t2;
# #
# Testing of FOR UPDATE # Testing of FOR UPDATE
# #
--disable_view_protocol
connection con1; connection con1;
eval create table t1 (id integer, x integer) engine = $engine_type; eval create table t1 (id integer, x integer) engine = $engine_type;
insert into t1 values(0, 0); insert into t1 values(0, 0);
@ -49,10 +49,11 @@ select * from t1;
commit; commit;
drop table t1; drop table t1;
--enable_view_protocol
# #
# Testing of FOR UPDATE # Testing of FOR UPDATE
# #
--disable_view_protocol
connection con1; connection con1;
eval create table t1 (id integer, x integer) engine = $engine_type; eval create table t1 (id integer, x integer) engine = $engine_type;
eval create table t2 (b integer, a integer) engine = $engine_type; eval create table t2 (b integer, a integer) engine = $engine_type;
@ -125,7 +126,7 @@ connection default;
disconnect con1; disconnect con1;
disconnect con2; disconnect con2;
drop table t1, t2; drop table t1, t2;
--enable_view_protocol
--echo End of 4.1 tests --echo End of 4.1 tests
# #
@ -152,3 +153,4 @@ drop table if exists a;
set default_storage_engine=default; set default_storage_engine=default;
--echo End of 5.0 tests. --echo End of 5.0 tests.
--enable_service_connection

18
mysql-test/include/empty_string_literal.inc
View File

@ -4,6 +4,12 @@ SET SESSION character_set_client=cp1250;
--echo # --echo #
--echo # Test litteral --echo # Test litteral
--echo # --echo #
#enable view protocol after fix MDEV-27871 and
# it is necessary that the view protocol uses the same connection,
# not util connection
--disable_view_protocol
SET sql_mode=@mode; SET sql_mode=@mode;
select @@sql_mode; select @@sql_mode;
SELECT '',CHARSET(''), null, CHARSET(null), CAST(null as char(10)), CHARSET(CAST(null as char(10))), 'x', CHARSET('x'); SELECT '',CHARSET(''), null, CHARSET(null), CAST(null as char(10)), CHARSET(CAST(null as char(10))), 'x', CHARSET('x');
@ -12,6 +18,8 @@ SET sql_mode=default;
SELECT '',CHARSET(''), null, CHARSET(null), CAST(null as char(10)), CHARSET(CAST(null as char(10))), 'x', CHARSET('x'); SELECT '',CHARSET(''), null, CHARSET(null), CAST(null as char(10)), CHARSET(CAST(null as char(10))), 'x', CHARSET('x');
SELECT CHARSET(NULLIF('','')),NULLIF('',''); SELECT CHARSET(NULLIF('','')),NULLIF('','');
--echo # --echo #
--echo # Test NCHAR litteral --echo # Test NCHAR litteral
--echo # --echo #
@ -22,6 +30,8 @@ SET sql_mode=default;
SELECT N'',CHARSET(N''), N'x', CHARSET(N'x'); SELECT N'',CHARSET(N''), N'x', CHARSET(N'x');
SELECT CHARSET(NULLIF(N'',N'')),NULLIF(N'',N''); SELECT CHARSET(NULLIF(N'',N'')),NULLIF(N'',N'');
--echo # --echo #
--echo # Test CHARSET prefix litteral --echo # Test CHARSET prefix litteral
--echo # --echo #
@ -52,6 +62,8 @@ SELECT '' '' '',CHARSET('' '' '');
SELECT _latin1'' '' '',CHARSET(_latin1'' '' ''); SELECT _latin1'' '' '',CHARSET(_latin1'' '' '');
SELECT N'' '' '',CHARSET(N'' '' ''); SELECT N'' '' '',CHARSET(N'' '' '');
--enable_view_protocol
--echo # --echo #
--echo # UNION - implicit group by --echo # UNION - implicit group by
--echo # --echo #
@ -70,10 +82,16 @@ UNION
SELECT 1 , _cp1250 '' SELECT 1 , _cp1250 ''
ORDER BY 1; ORDER BY 1;
# it is necessary that the view protocol uses the same connection,
# not util connection
--disable_view_protocol
SELECT NULLIF(_cp1250 '',_cp1250 '') SELECT NULLIF(_cp1250 '',_cp1250 '')
UNION UNION
SELECT NULLIF(N'',N''); SELECT NULLIF(N'',N'');
--enable_view_protocol
--error ER_CANT_AGGREGATE_2COLLATIONS --error ER_CANT_AGGREGATE_2COLLATIONS
SELECT 1 , _latin2 '' SELECT 1 , _latin2 ''
UNION UNION

3
mysql-test/include/explain_utils.inc
View File

@ -26,7 +26,7 @@
--echo # query: $query --echo # query: $query
--echo # select: $select --echo # select: $select
--echo # --echo #
--disable_view_protocol
if ($select) { if ($select) {
--enable_prepare_warnings --enable_prepare_warnings
--disable_query_log --disable_query_log
@ -163,3 +163,4 @@ SHOW STATUS WHERE (Variable_name LIKE 'Sort%' OR
--enable_query_log --enable_query_log
--echo --echo
--enable_view_protocol

3
mysql-test/include/func_hybrid_type.inc
View File

@ -1,5 +1,7 @@
# "mtr --ps" returns different values in "Max length" # "mtr --ps" returns different values in "Max length"
--disable_ps_protocol --disable_ps_protocol
# view protocol createincorrect table name
--disable_view_protocol
--enable_metadata --enable_metadata
--vertical_results --vertical_results
SELECT SELECT
@ -39,6 +41,7 @@ FROM t1;
--horizontal_results --horizontal_results
--disable_metadata --disable_metadata
--enable_ps_protocol --enable_ps_protocol
--enable_view_protocol
CREATE TABLE t2 AS CREATE TABLE t2 AS
SELECT SELECT
a AS ___________a, a AS ___________a,

8
mysql-test/include/gis_debug.inc
View File

@ -119,6 +119,8 @@ CALL p1(-1, 'GeometryCollection(Point(9 9),LineString(1 5,0 0),Polygon((2 2,2 8,
--enable_query_log --enable_query_log
#enable after fix MDEV-27871
--disable_view_protocol
SELECT ST_CONTAINS( SELECT ST_CONTAINS(
GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'), GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
GeomFromText('POINT(5 10)')); GeomFromText('POINT(5 10)'));
@ -138,6 +140,7 @@ SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0
--echo # --echo #
SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1)); SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1));
--enable_view_protocol
--echo # --echo #
--echo # Bug#13358363 - ASSERTION: N > 0 && N < SINUSES_CALCULATED*2+1 | GET_N_SINCOS/ADD_EDGE_BUFFER --echo # Bug#13358363 - ASSERTION: N > 0 && N < SINUSES_CALCULATED*2+1 | GET_N_SINCOS/ADD_EDGE_BUFFER
@ -145,6 +148,9 @@ SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3
DO ST_BUFFER(ST_GEOMCOLLFROMTEXT('linestring(1 1,2 2)'),''); DO ST_BUFFER(ST_GEOMCOLLFROMTEXT('linestring(1 1,2 2)'),'');
#enable after fix MDEV-27871
--disable_view_protocol
SELECT ST_WITHIN( SELECT ST_WITHIN(
LINESTRINGFROMTEXT(' LINESTRING(3 8,9 2,3 8,3 3,7 6,4 7,4 7,8 1) '), LINESTRINGFROMTEXT(' LINESTRING(3 8,9 2,3 8,3 3,7 6,4 7,4 7,8 1) '),
ST_BUFFER(MULTIPOLYGONFROMTEXT(' MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4)),((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5))) '), ST_BUFFER(MULTIPOLYGONFROMTEXT(' MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4)),((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5))) '),
@ -159,3 +165,5 @@ SELECT ST_NUMINTERIORRINGS(
SELECT ASTEXT(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((9 9,5 2,4 5,9 9))'), SELECT ASTEXT(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((9 9,5 2,4 5,9 9))'),
SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) ')))); SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) '))));
--enable_view_protocol

2
mysql-test/include/have_csv.inc
View File

@ -1,3 +1,5 @@
-- source include/no_view_protocol.inc
disable_query_log; disable_query_log;
--require include/true.require --require include/true.require
select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'csv'; select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'csv';

1
mysql-test/include/have_log_bin.inc
View File

@ -7,6 +7,7 @@
# source include/have_log_bin.inc; # source include/have_log_bin.inc;
source include/not_embedded.inc; source include/not_embedded.inc;
-- source include/no_view_protocol.inc
if (`select not @@log_bin`) { if (`select not @@log_bin`) {
skip Test requires: 'have_log_bin'; skip Test requires: 'have_log_bin';

8
mysql-test/include/index_merge1.inc
View File

@ -300,6 +300,10 @@ select * from t0 where key1 < 3 or key2 < 4;
select count(*) from t0; select count(*) from t0;
# Test for BUG#4177 # Test for BUG#4177
# enable view-protocol after fix MDEV-27871
--disable_view_protocol
drop table t4; drop table t4;
create table t4 (a int); create table t4 (a int);
insert into t4 values (1),(4),(3); insert into t4 values (1),(4),(3);
@ -349,6 +353,8 @@ set join_buffer_size= @save_join_buffer_size;
drop table t0, t1, t2, t3, t4; drop table t0, t1, t2, t3, t4;
--enable_view_protocol
# BUG#16166 # BUG#16166
CREATE TABLE t1 ( CREATE TABLE t1 (
cola char(3) not null, colb char(3) not null, filler char(200), cola char(3) not null, colb char(3) not null, filler char(200),
@ -412,6 +418,7 @@ drop table t1, t2, t3;
# #
# BUG#20256 - LOCK WRITE - MyISAM # BUG#20256 - LOCK WRITE - MyISAM
# #
--disable_service_connection
CREATE TABLE t1(a INT); CREATE TABLE t1(a INT);
INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(1);
CREATE TABLE t2(a INT, b INT, dummy CHAR(16) DEFAULT '', KEY(a), KEY(b)); CREATE TABLE t2(a INT, b INT, dummy CHAR(16) DEFAULT '', KEY(a), KEY(b));
@ -440,6 +447,7 @@ INSERT INTO t2(a,b) VALUES(1,2);
SELECT t2.a FROM t1,t2 WHERE t2.b=2 AND t2.a=1; SELECT t2.a FROM t1,t2 WHERE t2.b=2 AND t2.a=1;
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t1, t2; DROP TABLE t1, t2;
--enable_service_connection
# #
# BUG#29740: HA_KEY_SCAN_NOT_ROR wasn't set for HEAP engine # BUG#29740: HA_KEY_SCAN_NOT_ROR wasn't set for HEAP engine

4
mysql-test/include/mix2.inc
View File

@ -157,7 +157,7 @@ drop table t1;
# Test of reading on secondary key with may be null # Test of reading on secondary key with may be null
--disable_view_protocol
eval create table t1 (a int,b varchar(20),key(a)) engine=$engine_type; eval create table t1 (a int,b varchar(20),key(a)) engine=$engine_type;
insert into t1 values (1,""), (2,"testing"); insert into t1 values (1,""), (2,"testing");
select * from t1 where a = 1; select * from t1 where a = 1;
@ -289,7 +289,7 @@ drop table t1;
rename table t2 to t1; rename table t2 to t1;
drop table t1; drop table t1;
set autocommit=1; set autocommit=1;
--enable_view_protocol
# #
# The following simple tests failed at some point # The following simple tests failed at some point
# #

4
mysql-test/include/mysqlhotcopy.inc
View File

@ -23,7 +23,7 @@ if (!$MYSQLHOTCOPY)
# be skipped if Perl modules required by the mysqlhotcopy tool are not # be skipped if Perl modules required by the mysqlhotcopy tool are not
# found when the script is run this way. # found when the script is run this way.
--disable_service_connection
let $MYSQLD_DATADIR= `SELECT @@datadir`; let $MYSQLD_DATADIR= `SELECT @@datadir`;
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS hotcopy_test; DROP DATABASE IF EXISTS hotcopy_test;
@ -134,4 +134,4 @@ DROP DATABASE hotcopy_test_cpy;
DROP DATABASE hotcopy_test; DROP DATABASE hotcopy_test;
DROP DATABASE hotcopy_save; DROP DATABASE hotcopy_save;
DROP DATABASE hotcopy_save_old; DROP DATABASE hotcopy_save_old;
--enable_service_connection

6
mysql-test/include/no_view_protocol.inc Normal file
View File

@ -0,0 +1,6 @@
# The file with expected results fits only to a run without
# view-protocol.
if (`SELECT $VIEW_PROTOCOL > 0`)
{
--skip Test requires: view-protocol disabled
}

2
mysql-test/include/ps_conv.inc
View File

@ -77,7 +77,9 @@ show create table t5 ;
--vertical_results --vertical_results
--enable_metadata --enable_metadata
--disable_ps_protocol --disable_ps_protocol
--disable_view_protocol
select * from t5 ; select * from t5 ;
--enable_view_protocol
--enable_ps_protocol --enable_ps_protocol
--disable_metadata --disable_metadata
--horizontal_results --horizontal_results

3
mysql-test/include/query_cache.inc
View File

@ -14,7 +14,7 @@
# old name was innodb_cache.test # old name was innodb_cache.test
# main code went into include/query_cache.inc # main code went into include/query_cache.inc
# #
--disable_view_protocol
SET global query_cache_type=ON; SET global query_cache_type=ON;
SET local query_cache_type=ON; SET local query_cache_type=ON;
eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;
@ -191,3 +191,4 @@ set @@global.query_cache_size = @save_query_cache_size;
drop table t2; drop table t2;
SET global query_cache_type=default; SET global query_cache_type=default;
--enable_view_protocol

4
mysql-test/include/query_cache_partitions.inc
View File

@ -4,6 +4,10 @@
# $engine_type -- storage engine to be tested # $engine_type -- storage engine to be tested
# have to be set before sourcing this script. # have to be set before sourcing this script.
# Tests will be skipped for the view protocol because the view protocol creates
# an additional util connection and other statistics data
-- source include/no_view_protocol.inc
SET global query_cache_type=ON; SET global query_cache_type=ON;
SET local query_cache_type=ON; SET local query_cache_type=ON;
eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type;

11
mysql-test/include/unsafe_binlog.inc
View File

@ -21,7 +21,7 @@
# Test cases for bug#15650 # Test cases for bug#15650
# DELETE with LEFT JOIN crashes server with innodb_locks_unsafe_for_binlog # DELETE with LEFT JOIN crashes server with innodb_locks_unsafe_for_binlog
# #
--disable_service_connection
--disable_warnings --disable_warnings
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;
--enable_warnings --enable_warnings
@ -52,15 +52,19 @@ eval create table t1(a int not null, b int, primary key(a)) engine = $engine_typ
insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2),(7,3); insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2),(7,3);
commit; commit;
set autocommit = 0; set autocommit = 0;
--disable_view_protocol
select * from t1 lock in share mode; select * from t1 lock in share mode;
--enable_view_protocol
update t1 set b = 5 where b = 1; update t1 set b = 5 where b = 1;
connection b; connection b;
set autocommit = 0; set autocommit = 0;
# #
# S-lock to records (2,2),(4,2), and (6,2) should not be released in a update # S-lock to records (2,2),(4,2), and (6,2) should not be released in a update
# #
--disable_view_protocol
--error ER_LOCK_WAIT_TIMEOUT --error ER_LOCK_WAIT_TIMEOUT
select * from t1 where a = 2 and b = 2 for update; select * from t1 where a = 2 and b = 2 for update;
--enable_view_protocol
connection a; connection a;
commit; commit;
connection b; connection b;
@ -113,7 +117,9 @@ eval create table t2(d int not null, e int, primary key(d)) engine = $engine_typ
insert into t2 values (8,6),(12,1),(3,1); insert into t2 values (8,6),(12,1),(3,1);
commit; commit;
set autocommit = 0; set autocommit = 0;
--disable_view_protocol
select * from t2 for update; select * from t2 for update;
--enable_view_protocol
connection b; connection b;
set autocommit = 0; set autocommit = 0;
insert into t1 select * from t2; insert into t1 select * from t2;
@ -171,7 +177,9 @@ eval create table t9(d int not null, e int, primary key(d)) engine = $engine_typ
insert into t9 values (8,6),(12,1),(3,1); insert into t9 values (8,6),(12,1),(3,1);
commit; commit;
set autocommit = 0; set autocommit = 0;
--disable_view_protocol
select * from t2 for update; select * from t2 for update;
--enable_view_protocol
connection b; connection b;
set autocommit = 0; set autocommit = 0;
SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE; SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
@ -263,3 +271,4 @@ disconnect h;
disconnect i; disconnect i;
disconnect j; disconnect j;
drop table t1, t2, t3, t5, t6, t8, t9; drop table t1, t2, t3, t5, t6, t8, t9;
--enable_service_connection

3
mysql-test/include/update_use_source.inc
View File

@ -4,6 +4,8 @@
--echo # Update a with value from subquery on the same table, no search clause. ALL access --echo # Update a with value from subquery on the same table, no search clause. ALL access
--echo # --echo #
#Enable view protocol after fix MDEV-29207
--disable_view_protocol
start transaction; start transaction;
--enable_info ONCE --enable_info ONCE
update t1 update t1
@ -145,3 +147,4 @@ update t1
order by c3 desc limit 2; order by c3 desc limit 2;
select concat(old_c1,'->',c1),c3, case when c1 != old_c1 then '*' else ' ' end "Changed" from t1 ; select concat(old_c1,'->',c1),c3, case when c1 != old_c1 then '*' else ' ' end "Changed" from t1 ;
rollback; rollback;
--enable_view_protocol

4
mysql-test/include/weight_string.inc
View File

@ -33,7 +33,8 @@ DROP TABLE t1;
# #
# End of MDEV-5180 # End of MDEV-5180
# #
#enable after fix MDEV-29290
--disable_view_protocol
select hex(weight_string('a')); select hex(weight_string('a'));
select hex(weight_string('A')); select hex(weight_string('A'));
select hex(weight_string('abc')); select hex(weight_string('abc'));
@ -64,3 +65,4 @@ select hex(weight_string('abc', 3, 4, 0xC0));
select hex(weight_string('abc', 4, 4, 0xC0)); select hex(weight_string('abc', 4, 4, 0xC0));
select hex(weight_string('abc', 5, 4, 0xC0)); select hex(weight_string('abc', 5, 4, 0xC0));
select hex(weight_string('abc',25, 4, 0xC0)); select hex(weight_string('abc',25, 4, 0xC0));
--enable_view_protocol

4
mysql-test/include/weight_string_8140.inc
View File

@ -1,3 +1,5 @@
#enable after fix MDEV-29290
--disable_view_protocol
select collation(cast(0x8140 as char)); select collation(cast(0x8140 as char));
select hex(weight_string(cast(0x6141 as char))); select hex(weight_string(cast(0x6141 as char)));
select hex(weight_string(cast(0x8140 as char))); select hex(weight_string(cast(0x8140 as char)));
@ -33,4 +35,4 @@ select hex(weight_string(cast(0x814081408140 as char), 3, 4, 0xC0));
select hex(weight_string(cast(0x814081408140 as char), 4, 4, 0xC0)); select hex(weight_string(cast(0x814081408140 as char), 4, 4, 0xC0));
select hex(weight_string(cast(0x814081408140 as char), 5, 4, 0xC0)); select hex(weight_string(cast(0x814081408140 as char), 5, 4, 0xC0));
select hex(weight_string(cast(0x814081408140 as char),25, 4, 0xC0)); select hex(weight_string(cast(0x814081408140 as char),25, 4, 0xC0));
--enable_view_protocol

4
mysql-test/include/weight_string_8EA1.inc
View File

@ -1,3 +1,5 @@
#enable after fix MDEV-29290
--disable_view_protocol
select collation(cast(0xA1A1 as char)); select collation(cast(0xA1A1 as char));
select hex(weight_string(cast(0x6141 as char))); select hex(weight_string(cast(0x6141 as char)));
select hex(weight_string(cast(0x8EA1 as char))); select hex(weight_string(cast(0x8EA1 as char)));
@ -33,4 +35,4 @@ select hex(weight_string(cast(0x8EA18EA18EA1 as char), 3, 4, 0xC0));
select hex(weight_string(cast(0x8EA18EA18EA1 as char), 4, 4, 0xC0)); select hex(weight_string(cast(0x8EA18EA18EA1 as char), 4, 4, 0xC0));
select hex(weight_string(cast(0x8EA18EA18EA1 as char), 5, 4, 0xC0)); select hex(weight_string(cast(0x8EA18EA18EA1 as char), 5, 4, 0xC0));
select hex(weight_string(cast(0x8EA18EA18EA1 as char),25, 4, 0xC0)); select hex(weight_string(cast(0x8EA18EA18EA1 as char),25, 4, 0xC0));
--enable_view_protocol

4
mysql-test/include/weight_string_8FA2C3.inc
View File

@ -1,3 +1,5 @@
#enable after fix MDEV-29290
--disable_view_protocol
select collation(cast(0x8FA2C3 as char)); select collation(cast(0x8FA2C3 as char));
select hex(weight_string(cast(0x6141 as char))); select hex(weight_string(cast(0x6141 as char)));
select hex(weight_string(cast(0x8FA2C3 as char))); select hex(weight_string(cast(0x8FA2C3 as char)));
@ -33,4 +35,4 @@ select hex(weight_string(cast(0x8FA2C38FA2C38FA2C3 as char), 3, 4, 0xC0));
select hex(weight_string(cast(0x8FA2C38FA2C38FA2C3 as char), 4, 4, 0xC0)); select hex(weight_string(cast(0x8FA2C38FA2C38FA2C3 as char), 4, 4, 0xC0));
select hex(weight_string(cast(0x8FA2C38FA2C38FA2C3 as char), 5, 4, 0xC0)); select hex(weight_string(cast(0x8FA2C38FA2C38FA2C3 as char), 5, 4, 0xC0));
select hex(weight_string(cast(0x8FA2C38FA2C38FA2C3 as char),25, 4, 0xC0)); select hex(weight_string(cast(0x8FA2C38FA2C38FA2C3 as char),25, 4, 0xC0));
--enable_view_protocol

4
mysql-test/include/weight_string_A1A1.inc
View File

@ -1,3 +1,5 @@
#enable after fix MDEV-29290
--disable_view_protocol
select collation(cast(0xA1A1 as char)); select collation(cast(0xA1A1 as char));
select hex(weight_string(cast(0x6141 as char))); select hex(weight_string(cast(0x6141 as char)));
select hex(weight_string(cast(0xA1A1 as char))); select hex(weight_string(cast(0xA1A1 as char)));
@ -33,4 +35,4 @@ select hex(weight_string(cast(0xA1A1A1A1A1A1 as char), 3, 4, 0xC0));
select hex(weight_string(cast(0xA1A1A1A1A1A1 as char), 4, 4, 0xC0)); select hex(weight_string(cast(0xA1A1A1A1A1A1 as char), 4, 4, 0xC0));
select hex(weight_string(cast(0xA1A1A1A1A1A1 as char), 5, 4, 0xC0)); select hex(weight_string(cast(0xA1A1A1A1A1A1 as char), 5, 4, 0xC0));
select hex(weight_string(cast(0xA1A1A1A1A1A1 as char),25, 4, 0xC0)); select hex(weight_string(cast(0xA1A1A1A1A1A1 as char),25, 4, 0xC0));
--enable_view_protocol

3
mysql-test/include/weight_string_chde.inc
View File

@ -1,3 +1,5 @@
#enable after fix MDEV-29290
--disable_view_protocol
select @@collation_connection; select @@collation_connection;
select collation(cast(_latin1 0xDF as char)); select collation(cast(_latin1 0xDF as char));
select hex(weight_string('s')); select hex(weight_string('s'));
@ -57,3 +59,4 @@ select hex(weight_string(cast(_latin1 0xDF6368 as char), 2, 4,0xC0));
select hex(weight_string(cast(_latin1 0xDF6368 as char), 3, 4,0xC0)); select hex(weight_string(cast(_latin1 0xDF6368 as char), 3, 4,0xC0));
select hex(weight_string(cast(_latin1 0xDF6368 as char), 4, 4,0xC0)); select hex(weight_string(cast(_latin1 0xDF6368 as char), 4, 4,0xC0));
select hex(weight_string(cast(_latin1 0xDF6368 as char),25, 4,0xC0)); select hex(weight_string(cast(_latin1 0xDF6368 as char),25, 4,0xC0));
--enable_view_protocol

3
mysql-test/include/weight_string_euro.inc
View File

@ -1,3 +1,5 @@
#enable after fix MDEV-29290
--disable_view_protocol
select @@collation_connection; select @@collation_connection;
select hex(weight_string(cast(_latin1 0x80 as char))); select hex(weight_string(cast(_latin1 0x80 as char)));
select hex(weight_string(cast(_latin1 0x808080 as char))); select hex(weight_string(cast(_latin1 0x808080 as char)));
@ -28,3 +30,4 @@ select hex(weight_string(cast(_latin1 0x808080 as char), 3, 4, 0xC0));
select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0)); select hex(weight_string(cast(_latin1 0x808080 as char), 4, 4, 0xC0));
select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0)); select hex(weight_string(cast(_latin1 0x808080 as char), 5, 4, 0xC0));
select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0)); select hex(weight_string(cast(_latin1 0x808080 as char),25, 4, 0xC0));
--enable_view_protocol

3
mysql-test/include/weight_string_l1.inc
View File

@ -1,3 +1,5 @@
#enable after fix MDEV-29290
--disable_view_protocol
select @@collation_connection; select @@collation_connection;
select hex(weight_string('a' LEVEL 1)); select hex(weight_string('a' LEVEL 1));
select hex(weight_string('A' LEVEL 1)); select hex(weight_string('A' LEVEL 1));
@ -8,3 +10,4 @@ select hex(weight_string('abc' as char(5) LEVEL 1));
select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE)); select hex(weight_string('abc' as char(5) LEVEL 1 REVERSE));
select hex(weight_string('abc' as char(5) LEVEL 1 DESC)); select hex(weight_string('abc' as char(5) LEVEL 1 DESC));
select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE)); select hex(weight_string('abc' as char(5) LEVEL 1 DESC REVERSE));
--enable_view_protocol

3
mysql-test/include/weight_string_l2.inc
View File

@ -1,3 +1,5 @@
#enable after fix MDEV-29290
--disable_view_protocol
select @@collation_connection; select @@collation_connection;
select hex(weight_string('a' LEVEL 2)); select hex(weight_string('a' LEVEL 2));
select hex(weight_string('A' LEVEL 2)); select hex(weight_string('A' LEVEL 2));
@ -5,3 +7,4 @@ select hex(weight_string('abc' LEVEL 2));
select hex(weight_string('abc' as char(2) LEVEL 2)); select hex(weight_string('abc' as char(2) LEVEL 2));
select hex(weight_string('abc' as char(3) LEVEL 2)); select hex(weight_string('abc' as char(3) LEVEL 2));
select hex(weight_string('abc' as char(5) LEVEL 2)); select hex(weight_string('abc' as char(5) LEVEL 2));
--disable_view_protocol

3
mysql-test/main/alias.test
View File

@ -1,3 +1,6 @@
#remove this include after fix MDEV-27871
--source include/no_view_protocol.inc
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
--enable_warnings --enable_warnings

4
mysql-test/main/alter_table.test
View File

@ -779,6 +779,8 @@ drop table t1;
# Unix/Windows and transactional/non-transactional tables). # Unix/Windows and transactional/non-transactional tables).
# See also innodb_mysql.test # See also innodb_mysql.test
# #
--disable_service_connection
--disable_warnings --disable_warnings
drop table if exists t1, t2, t3; drop table if exists t1, t2, t3;
--enable_warnings --enable_warnings
@ -821,7 +823,7 @@ unlock tables;
insert into t1 values (); insert into t1 values ();
select * from t1; select * from t1;
drop tables t1, t3; drop tables t1, t3;
--enable_service_connection
# #
# Bug#18775 - Temporary table from alter table visible to other threads # Bug#18775 - Temporary table from alter table visible to other threads

3
mysql-test/main/ansi.test
View File

@ -5,7 +5,7 @@
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
--enable_warnings --enable_warnings
--disable_service_connection
set sql_mode="MySQL40"; set sql_mode="MySQL40";
select @@sql_mode; select @@sql_mode;
set @@sql_mode="ANSI"; set @@sql_mode="ANSI";
@ -72,3 +72,4 @@ SELECT -1||0^1 AS a FROM DUAL;
EXPLAIN EXTENDED SELECT -1^1||1 AS a FROM DUAL; EXPLAIN EXTENDED SELECT -1^1||1 AS a FROM DUAL;
EXPLAIN EXTENDED SELECT -1||0^1 AS a FROM DUAL; EXPLAIN EXTENDED SELECT -1||0^1 AS a FROM DUAL;
--enable_service_connection

4
mysql-test/main/auto_increment_ranges_innodb.test
View File

@ -23,7 +23,7 @@ drop table t1;
--echo # MDEV-21842: auto_increment does not increment with compound primary --echo # MDEV-21842: auto_increment does not increment with compound primary
--echo # key on partitioned table --echo # key on partitioned table
--echo # --echo #
--disable_service_connection
create or replace table `t` ( create or replace table `t` (
`id` bigint(20) unsigned not null auto_increment, `id` bigint(20) unsigned not null auto_increment,
`a` int(10) not null , `a` int(10) not null ,
@ -76,4 +76,4 @@ disconnect con2;
--connection default --connection default
select * from t; select * from t;
drop table t; drop table t;
--enable_service_connection

4
mysql-test/main/backup_aria.test
View File

@ -8,6 +8,7 @@
# As non transactional engine we use Aria with TRANSACTIONAL = 0 # As non transactional engine we use Aria with TRANSACTIONAL = 0
--source include/have_aria.inc --source include/have_aria.inc
--disable_service_connection
# Following connections are used in a few of the following tests # Following connections are used in a few of the following tests
connect (con1,localhost,root,,); connect (con1,localhost,root,,);
@ -61,6 +62,7 @@ INSERT INTO t_permanent_aria SET col1 = 1;
CREATE TABLE throw_away (col1 INT) ENGINE = Aria TRANSACTIONAL = 0; CREATE TABLE throw_away (col1 INT) ENGINE = Aria TRANSACTIONAL = 0;
--error ER_BACKUP_LOCK_IS_ACTIVE --error ER_BACKUP_LOCK_IS_ACTIVE
RENAME TABLE t_permanent_aria To throw_away; RENAME TABLE t_permanent_aria To throw_away;
--disable_view_protocol
--echo # - DDL creating a temporary table is allowed. --echo # - DDL creating a temporary table is allowed.
CREATE TEMPORARY TABLE t_temporary_aria (col1 INT) ENGINE = Aria TRANSACTIONAL = 0; CREATE TEMPORARY TABLE t_temporary_aria (col1 INT) ENGINE = Aria TRANSACTIONAL = 0;
--echo # - DML modifying that temporary table is allowed. --echo # - DML modifying that temporary table is allowed.
@ -107,6 +109,7 @@ ALTER TABLE t_temporary_aria ADD KEY idx(col2);
BACKUP STAGE END; BACKUP STAGE END;
DROP TABLE t_permanent_aria; DROP TABLE t_permanent_aria;
--enable_view_protocol
--echo #----------------------------------------------------------------------- --echo #-----------------------------------------------------------------------
--echo # Show that non transactional tables locks with BACKUP STAGE FLUSH --echo # Show that non transactional tables locks with BACKUP STAGE FLUSH
@ -155,3 +158,4 @@ drop table t1;
--echo # --echo #
disconnect con1; disconnect con1;
--enable_service_connection

14
mysql-test/main/backup_interaction.test
View File

@ -50,6 +50,7 @@ unlock tables;
--echo # --echo #
--echo # Check lock tables under BACKUP STAGE --echo # Check lock tables under BACKUP STAGE
--echo # --echo #
--disable_service_connection
backup stage start; backup stage start;
unlock tables; unlock tables;
select lock_mode from information_schema.metadata_lock_info where thread_id>0; select lock_mode from information_schema.metadata_lock_info where thread_id>0;
@ -61,7 +62,7 @@ lock table t1 read;
unlock tables; unlock tables;
backup stage end; backup stage end;
drop table t1; drop table t1;
--enable_service_connection
--echo # --echo #
--echo # Check setting readonly under BACKUP STAGE --echo # Check setting readonly under BACKUP STAGE
@ -118,6 +119,7 @@ drop table t1;
--echo # --echo #
--echo # BACKUP STAGE performs implicit commits --echo # BACKUP STAGE performs implicit commits
--echo # --echo #
--disable_view_protocol
create table t1(a int) engine=InnoDB; create table t1(a int) engine=InnoDB;
begin; begin;
insert into t1 values(1); insert into t1 values(1);
@ -128,12 +130,13 @@ backup stage block_commit;
commit; commit;
backup stage end; backup stage end;
drop table t1; drop table t1;
--enable_view_protocol
--echo # Ensure that BACKUP STAGE ... does AUTOCOMMIT like most DDL. --echo # Ensure that BACKUP STAGE ... does AUTOCOMMIT like most DDL.
--echo # Sideeffect: --echo # Sideeffect:
--echo # Show the impact of not yet committed INSERT before sequence start --echo # Show the impact of not yet committed INSERT before sequence start
--echo # and ROLLBACK sliding through the sequence. --echo # and ROLLBACK sliding through the sequence.
--disable_service_connection
CREATE TABLE t1 (col1 INT) ENGINE = InnoDB; CREATE TABLE t1 (col1 INT) ENGINE = InnoDB;
SET AUTOCOMMIT = 0; SET AUTOCOMMIT = 0;
INSERT INTO t1 SET col1 = 1; INSERT INTO t1 SET col1 = 1;
@ -217,7 +220,7 @@ drop table t1;
--echo # CHECK: RO transaction under BACKUP STAGE is a potential deadlock --echo # CHECK: RO transaction under BACKUP STAGE is a potential deadlock
--echo # OTOH we most probably allow them under FTWRL as well --echo # OTOH we most probably allow them under FTWRL as well
--echo # --echo #
--disable_view_protocol
CREATE TABLE t1 (col1 INT) ENGINE = InnoDB; CREATE TABLE t1 (col1 INT) ENGINE = InnoDB;
insert into t1 values (1); insert into t1 values (1);
backup stage start; backup stage start;
@ -228,6 +231,7 @@ select lock_mode from information_schema.metadata_lock_info where thread_id>0;
backup stage end; backup stage end;
select lock_mode from information_schema.metadata_lock_info where thread_id>0; select lock_mode from information_schema.metadata_lock_info where thread_id>0;
drop table t1; drop table t1;
--enable_view_protocol
--echo # --echo #
--echo # Check that handler are closed by backup stage block_ddl --echo # Check that handler are closed by backup stage block_ddl
@ -347,6 +351,7 @@ SET SESSION sql_log_bin = 1;
SET SESSION sql_log_bin = 0; SET SESSION sql_log_bin = 0;
BACKUP STAGE END; BACKUP STAGE END;
SET SESSION sql_log_bin = 1; SET SESSION sql_log_bin = 1;
--enable_service_connection
--echo #----------------------------------------------------------------------- --echo #-----------------------------------------------------------------------
--echo # BACKUP STAGE statements are not allowed in stored routines --echo # BACKUP STAGE statements are not allowed in stored routines
@ -446,7 +451,7 @@ DROP TABLE t1_myisam;
--echo # --echo #
--echo # Creating and modifying TEMPORARY TABLES are allowed --echo # Creating and modifying TEMPORARY TABLES are allowed
--echo # --echo #
--disable_view_protocol
BACKUP STAGE START; BACKUP STAGE START;
BACKUP STAGE BLOCK_DDL; BACKUP STAGE BLOCK_DDL;
CREATE TEMPORARY TABLE tmp (col1 INT); CREATE TEMPORARY TABLE tmp (col1 INT);
@ -501,6 +506,7 @@ TRUNCATE t_temporary_innodb;
ALTER TABLE t_temporary_innodb ADD COLUMN col2 INT; ALTER TABLE t_temporary_innodb ADD COLUMN col2 INT;
ALTER TABLE t_temporary_innodb ADD KEY idx(col2); ALTER TABLE t_temporary_innodb ADD KEY idx(col2);
BACKUP STAGE END; BACKUP STAGE END;
--enable_view_protocol
# #
# MDEV-18067, MDEV-18068 and MDEV-18069 # MDEV-18067, MDEV-18068 and MDEV-18069

2
mysql-test/main/backup_lock.test
View File

@ -5,6 +5,8 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_metadata_lock_info.inc --source include/have_metadata_lock_info.inc
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/no_view_protocol.inc
--echo # --echo #
--echo # Testing which locks we get from all stages --echo # Testing which locks we get from all stages

1
mysql-test/main/backup_locks.test
View File

@ -5,6 +5,7 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_metadata_lock_info.inc --source include/have_metadata_lock_info.inc
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/no_view_protocol.inc
--echo # --echo #
--echo # Test lock taken --echo # Test lock taken

3
mysql-test/main/backup_priv.test
View File

@ -5,6 +5,7 @@
--echo # --echo #
--echo # Test privileges for BACKUP STAGES --echo # Test privileges for BACKUP STAGES
--echo # --echo #
--disable_service_connection
set sql_mode=""; set sql_mode="";
@ -50,3 +51,5 @@ DROP USER user1@localhost, user2@localhost;
--error ER_SP_BADSTATEMENT --error ER_SP_BADSTATEMENT
create procedure foo42() create procedure foo42()
BACKUP STAGE START; BACKUP STAGE START;
--enable_service_connection

2
mysql-test/main/bigint.test
View File

@ -311,6 +311,7 @@ select cast(-19999999999999999999 as signed);
# #
# PS protocol gives different metadata for `Max length' column # PS protocol gives different metadata for `Max length' column
--disable_view_protocol
--disable_ps_protocol --disable_ps_protocol
--enable_metadata --enable_metadata
select -9223372036854775808; select -9223372036854775808;
@ -319,6 +320,7 @@ select -((9223372036854775808));
select -(-(9223372036854775808)); select -(-(9223372036854775808));
--disable_metadata --disable_metadata
--enable_ps_protocol --enable_ps_protocol
--enable_view_protocol
select --9223372036854775808, ---9223372036854775808, ----9223372036854775808; select --9223372036854775808, ---9223372036854775808, ----9223372036854775808;
select -(-9223372036854775808), -(-(-9223372036854775808)); select -(-9223372036854775808), -(-(-9223372036854775808));

3
mysql-test/main/binary.test
View File

@ -18,9 +18,12 @@ select min(name),min(concat("*",name,"*")),max(name),max(concat("*",name,"*")) f
select * from t2 order by name; select * from t2 order by name;
select concat("*",name,"*") from t2 order by 1; select concat("*",name,"*") from t2 order by 1;
select min(name),min(concat("*",name,"*")),max(name),max(concat("*",name,"*")) from t2; select min(name),min(concat("*",name,"*")),max(name),max(concat("*",name,"*")) from t2;
#check after fix MDEV-29601
--disable_service_connection
select name from t1 where name between '<27>' and '<27>'; select name from t1 where name between '<27>' and '<27>';
select name from t2 where name between '<27>' and '<27>'; select name from t2 where name between '<27>' and '<27>';
select name from t2 where name between '<27>' and '<27>'; select name from t2 where name between '<27>' and '<27>';
--enable_service_connection
drop table t1,t2; drop table t1,t2;

2
mysql-test/main/bool.test
View File

@ -21,10 +21,12 @@ SELECT * FROM t1 where (1 AND a)=1;
SELECT * FROM t1 where (1 AND a) IS NULL; SELECT * FROM t1 where (1 AND a) IS NULL;
# WL#638 - Behaviour of NOT does not follow SQL specification # WL#638 - Behaviour of NOT does not follow SQL specification
--disable_service_connection
set sql_mode='high_not_precedence'; set sql_mode='high_not_precedence';
select * from t1 where not a between 2 and 3; select * from t1 where not a between 2 and 3;
set sql_mode=default; set sql_mode=default;
select * from t1 where not a between 2 and 3; select * from t1 where not a between 2 and 3;
--enable_service_connection
# SQL boolean tests # SQL boolean tests
select a, a is false, a is true, a is unknown from t1; select a, a is false, a is true, a is unknown from t1;

3
mysql-test/main/brackets.test
View File

@ -2246,6 +2246,8 @@ drop view v1;
--echo 10.2. view as tailed simple select --echo 10.2. view as tailed simple select
#enable after fix MDEV-29554
--disable_view_protocol
create view v1 as create view v1 as
select * from t1 order by a; select * from t1 order by a;
show create view v1; show create view v1;
@ -2257,6 +2259,7 @@ create view v1 as
show create view v1; show create view v1;
select * from v1; select * from v1;
drop view v1; drop view v1;
--enable_view_protocol
--echo 10.3. view as union --echo 10.3. view as union

3
mysql-test/main/cache_innodb.test
View File

@ -19,6 +19,7 @@ let $test_foreign_keys= 1;
# Bug#56452 Assertion failed: thd->transaction.stmt.is_empty() || # Bug#56452 Assertion failed: thd->transaction.stmt.is_empty() ||
# thd->in_sub_stmt # thd->in_sub_stmt
# #
--disable_view_protocol
CREATE TABLE t1 (a INT) ENGINE=InnoDB; CREATE TABLE t1 (a INT) ENGINE=InnoDB;
BEGIN; BEGIN;
INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(1);
@ -28,4 +29,4 @@ ROLLBACK WORK AND CHAIN NO RELEASE;
SELECT a FROM t1; SELECT a FROM t1;
ROLLBACK; ROLLBACK;
DROP TABLE t1; DROP TABLE t1;
--enable_view_protocol

3
mysql-test/main/case.test
View File

@ -2,6 +2,9 @@
# Testing of CASE # Testing of CASE
# #
#remove this include after fix MDEV-27871
--source include/no_view_protocol.inc
--disable_warnings --disable_warnings
drop table if exists t1, t2; drop table if exists t1, t2;
--enable_warnings --enable_warnings

4
mysql-test/main/cast.test
View File

@ -2,6 +2,10 @@
# Test of cast function # Test of cast function
# #
#remove this include after fix MDEV-27871
# discuss what to do with "set names binary"
--source include/no_view_protocol.inc
# For TIME->DATETIME conversion # For TIME->DATETIME conversion
SET timestamp=unix_timestamp('2001-02-03 10:20:30'); SET timestamp=unix_timestamp('2001-02-03 10:20:30');

2
mysql-test/main/change_user.test
View File

@ -1,4 +1,5 @@
# This test is checking that old password authentication works # This test is checking that old password authentication works
--disable_service_connection
set global secure_auth=0; set global secure_auth=0;
# #
# functional change user tests # functional change user tests
@ -149,3 +150,4 @@ select year(now()) > 2011;
--echo change_user --echo change_user
--change_user --change_user
select year(now()) > 2011; select year(now()) > 2011;
--enable_service_connection

1
mysql-test/main/client_xml.test
View File

@ -1,5 +1,6 @@
# Can't run with embedded server # Can't run with embedded server
-- source include/not_embedded.inc -- source include/not_embedded.inc
-- source include/no_view_protocol.inc
# Disable concurrent inserts to avoid test failures when reading # Disable concurrent inserts to avoid test failures when reading
# data from concurrent connections (insert might return before # data from concurrent connections (insert might return before

2
mysql-test/main/comment_database.test
View File

@ -52,6 +52,7 @@ SHOW CREATE DATABASE db1;
DROP DATABASE db1; DROP DATABASE db1;
# Test the case when the database is named 'comment' # Test the case when the database is named 'comment'
--disable_service_connection
CREATE DATABASE comment COMMENT 'comment' CHARACTER SET 'latin2'; CREATE DATABASE comment COMMENT 'comment' CHARACTER SET 'latin2';
SHOW CREATE DATABASE comment; SHOW CREATE DATABASE comment;
ALTER DATABASE comment COMMENT 'comment comment'; ALTER DATABASE comment COMMENT 'comment comment';
@ -61,3 +62,4 @@ ALTER DATABASE COMMENT 'comment';
SELECT * FROM information_schema.schemata SELECT * FROM information_schema.schemata
WHERE schema_name='comment'; WHERE schema_name='comment';
DROP DATABASE comment; DROP DATABASE comment;
--enable_service_connection

1
mysql-test/main/commit.test
View File

@ -1,4 +1,5 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/no_view_protocol.inc
connect (con1,localhost,root,,); connect (con1,localhost,root,,);

5
mysql-test/main/concurrent_innodb_safelog.test
View File

@ -11,7 +11,6 @@
# t/concurrent_innodb_unsafelog.test # t/concurrent_innodb_unsafelog.test
# new wrapper t/concurrent_innodb_safelog.test # new wrapper t/concurrent_innodb_safelog.test
# #
--source include/have_innodb.inc --source include/have_innodb.inc
let $engine_type= InnoDB; let $engine_type= InnoDB;
@ -19,7 +18,7 @@ let $engine_type= InnoDB;
SET @save_timeout = @@GLOBAL.innodb_lock_wait_timeout; SET @save_timeout = @@GLOBAL.innodb_lock_wait_timeout;
SET GLOBAL innodb_lock_wait_timeout = 1; SET GLOBAL innodb_lock_wait_timeout = 1;
SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ; SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ;
--disable_service_connection
--source include/concurrent.inc --source include/concurrent.inc
--enable_service_connection
SET GLOBAL innodb_lock_wait_timeout = @save_timeout; SET GLOBAL innodb_lock_wait_timeout = @save_timeout;

4
mysql-test/main/concurrent_innodb_unsafelog.test
View File

@ -20,8 +20,8 @@ SET @save_timeout = @@GLOBAL.innodb_lock_wait_timeout;
SET GLOBAL innodb_lock_wait_timeout = 1; SET GLOBAL innodb_lock_wait_timeout = 1;
SET @save_isolation = @@GLOBAL.tx_isolation; SET @save_isolation = @@GLOBAL.tx_isolation;
SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED; SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED;
--disable_service_connection
--source include/concurrent.inc --source include/concurrent.inc
--enable_service_connection
SET GLOBAL innodb_lock_wait_timeout = @save_timeout; SET GLOBAL innodb_lock_wait_timeout = @save_timeout;
SET GLOBAL tx_isolation = @save_isolation; SET GLOBAL tx_isolation = @save_isolation;

31
mysql-test/main/create.test
View File

@ -106,6 +106,7 @@ create table t1 (i int, index `` (i));
# We don't allow creation of non-temporary tables under LOCK TABLES # We don't allow creation of non-temporary tables under LOCK TABLES
# as following meta-data locking protocol in this case can lead to # as following meta-data locking protocol in this case can lead to
# deadlock. # deadlock.
--disable_service_connection
create table t1 (i int); create table t1 (i int);
lock tables t1 read; lock tables t1 read;
--error ER_TABLE_NOT_LOCKED --error ER_TABLE_NOT_LOCKED
@ -115,6 +116,7 @@ create temporary table t2 (j int);
drop temporary table t2; drop temporary table t2;
unlock tables; unlock tables;
drop table t1; drop table t1;
--enable_service_connection
# #
# Test of CREATE ... SELECT with indexes # Test of CREATE ... SELECT with indexes
@ -286,7 +288,7 @@ drop table if exists t2,t1;
# #
# Test for CREATE TABLE .. LIKE .. # Test for CREATE TABLE .. LIKE ..
# #
--disable_view_protocol
create table t1(id int not null, name char(20)); create table t1(id int not null, name char(20));
insert into t1 values(10,'mysql'),(20,'monty- the creator'); insert into t1 values(10,'mysql'),(20,'monty- the creator');
create table t2(id int not null); create table t2(id int not null);
@ -325,13 +327,14 @@ create temporary table t3 like t1;
drop table t1, t2, t3; drop table t1, t2, t3;
drop table t3; drop table t3;
drop database mysqltest; drop database mysqltest;
--enable_view_protocol
# #
# CREATE TABLE LIKE under LOCK TABLES # CREATE TABLE LIKE under LOCK TABLES
# #
# Similarly to ordinary CREATE TABLE we don't allow creation of # Similarly to ordinary CREATE TABLE we don't allow creation of
# non-temporary tables under LOCK TABLES. Also we require source # non-temporary tables under LOCK TABLES. Also we require source
# table to be locked. # table to be locked.
--disable_service_connection
create table t1 (i int); create table t1 (i int);
create table t2 (j int); create table t2 (j int);
lock tables t1 read; lock tables t1 read;
@ -345,6 +348,7 @@ drop temporary table t3;
create temporary table t3 like t2; create temporary table t3 like t2;
unlock tables; unlock tables;
drop tables t1, t2; drop tables t1, t2;
--enable_service_connection
# #
# Test default table type # Test default table type
@ -453,7 +457,7 @@ drop table t1, t2, t3;
# #
# Bug #1209 # Bug #1209
# #
--disable_service_connection
create database mysqltest; create database mysqltest;
use mysqltest; use mysqltest;
select database(); select database();
@ -469,6 +473,7 @@ connection default;
disconnect user1; disconnect user1;
drop user mysqltest_1; drop user mysqltest_1;
use test; use test;
--enable_service_connection
# #
# Test for Bug 856 'Naming a key "Primary" causes trouble' # Test for Bug 856 'Naming a key "Primary" causes trouble'
@ -530,6 +535,7 @@ drop table t1,t2;
# This tests two additional possible errors and a hang if # This tests two additional possible errors and a hang if
# an improper fix is present. # an improper fix is present.
# #
--disable_service_connection
create table t1 (a int); create table t1 (a int);
--error ER_TABLE_EXISTS_ERROR --error ER_TABLE_EXISTS_ERROR
create table t1 select * from t1; create table t1 select * from t1;
@ -538,6 +544,7 @@ create table t2 union = (t1) select * from t1;
flush tables with read lock; flush tables with read lock;
unlock tables; unlock tables;
drop table t1; drop table t1;
--enable_service_connection
# #
# Bug#10413: Invalid column name is not rejected # Bug#10413: Invalid column name is not rejected
@ -771,14 +778,14 @@ create table t1 select coalesce('a' collate latin1_swedish_ci,'b' collate latin1
# permanent table. After patch for Bug#47418, we create the base table and # permanent table. After patch for Bug#47418, we create the base table and
# instert data into it, even though a temporary table exists with the same # instert data into it, even though a temporary table exists with the same
# name. # name.
--disable_view_protocol
create temporary table t1 (j int); create temporary table t1 (j int);
create table if not exists t1 select 1; create table if not exists t1 select 1;
select * from t1; select * from t1;
drop temporary table t1; drop temporary table t1;
select * from t1; select * from t1;
drop table t1; drop table t1;
--enable_view_protocol
# #
# CREATE TABLE ... SELECT and LOCK TABLES # CREATE TABLE ... SELECT and LOCK TABLES
# #
@ -787,7 +794,7 @@ drop table t1;
# the server doesn't crash, hang and produces sensible errors. # the server doesn't crash, hang and produces sensible errors.
# Includes test for bug #20662 "Infinite loop in CREATE TABLE # Includes test for bug #20662 "Infinite loop in CREATE TABLE
# IF NOT EXISTS ... SELECT with locked tables". # IF NOT EXISTS ... SELECT with locked tables".
--disable_service_connection
create table t1 (i int); create table t1 (i int);
insert into t1 values (1), (2); insert into t1 values (1), (2);
lock tables t1 read; lock tables t1 read;
@ -832,7 +839,7 @@ create temporary table if not exists t2 select * from t1;
select * from t2; select * from t2;
unlock tables; unlock tables;
drop table t1, t2; drop table t1, t2;
--enable_service_connection
# #
# Bug#21772: can not name a column 'upgrade' when create a table # Bug#21772: can not name a column 'upgrade' when create a table
@ -1301,7 +1308,7 @@ DROP VIEW t2;
--echo # Bug #49193 CREATE TABLE reacts differently depending --echo # Bug #49193 CREATE TABLE reacts differently depending
--echo # on whether data is selected or not --echo # on whether data is selected or not
--echo # --echo #
--disable_view_protocol
CREATE TEMPORARY TABLE t2 (ID INT); CREATE TEMPORARY TABLE t2 (ID INT);
INSERT INTO t2 VALUES (1),(2),(3); INSERT INTO t2 VALUES (1),(2),(3);
@ -1337,7 +1344,7 @@ SELECT * FROM t1;
DROP TABLE t1; DROP TABLE t1;
DROP TEMPORARY TABLE t2; DROP TEMPORARY TABLE t2;
--enable_view_protocol
--echo # --echo #
--echo # Bug #22909 "Using CREATE ... LIKE is possible to create field --echo # Bug #22909 "Using CREATE ... LIKE is possible to create field
@ -1418,7 +1425,7 @@ drop table t1;
--echo # --echo #
--echo # 2. A temporary table. --echo # 2. A temporary table.
--echo # --echo #
--disable_view_protocol
create temporary table if not exists t1 (a int) select 1 as a; create temporary table if not exists t1 (a int) select 1 as a;
select * from t1; select * from t1;
--error ER_TABLE_EXISTS_ERROR --error ER_TABLE_EXISTS_ERROR
@ -1571,6 +1578,7 @@ select * from t1;
drop table t1; drop table t1;
--error ER_NO_SUCH_TABLE --error ER_NO_SUCH_TABLE
create table if not exists t1 (a int) select * from t1; create table if not exists t1 (a int) select * from t1;
--enable_view_protocol
--echo # --echo #
--echo # 7. Test of non-matching columns, REPLACE and IGNORE. --echo # 7. Test of non-matching columns, REPLACE and IGNORE.
@ -1611,7 +1619,7 @@ drop table t1;
--echo # --echo #
--echo # Checking that CREATE IF NOT EXISTS is not blocked by running SELECT --echo # Checking that CREATE IF NOT EXISTS is not blocked by running SELECT
--echo # --echo #
--disable_service_connection
create table t1 (a int, b int) engine=myisam; create table t1 (a int, b int) engine=myisam;
create table t2 (a int, b int) engine=myisam; create table t2 (a int, b int) engine=myisam;
insert into t1 values (1,1); insert into t1 values (1,1);
@ -1634,6 +1642,7 @@ connection default;
select * from t1; select * from t1;
unlock tables; unlock tables;
drop table t1,t2; drop table t1,t2;
--enable_service_connection
--echo # --echo #
--echo # MDEV-6179: dynamic columns functions/cast()/convert() doesn't --echo # MDEV-6179: dynamic columns functions/cast()/convert() doesn't

1
mysql-test/main/create_drop_event.test
View File

@ -1,4 +1,5 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/no_view_protocol.inc
SET timestamp=UNIX_TIMESTAMP('2014-11-01 10:20:30'); SET timestamp=UNIX_TIMESTAMP('2014-11-01 10:20:30');
SET GLOBAL event_scheduler=off; SET GLOBAL event_scheduler=off;

1
mysql-test/main/create_drop_role.test
View File

@ -1,3 +1,4 @@
--source include/no_view_protocol.inc
--source include/not_embedded.inc --source include/not_embedded.inc
CREATE ROLE IF NOT EXISTS role1 WITH ADMIN user1; CREATE ROLE IF NOT EXISTS role1 WITH ADMIN user1;

8
mysql-test/main/create_or_replace.test
View File

@ -44,7 +44,7 @@ DROP TEMPORARY TABLE t1;
--echo # --echo #
--echo # Testing with temporary tables --echo # Testing with temporary tables
--echo # --echo #
--disable_view_protocol
CREATE OR REPLACE TABLE t1 (a int); CREATE OR REPLACE TABLE t1 (a int);
CREATE OR REPLACE TEMPORARY TABLE t1 (a int); CREATE OR REPLACE TEMPORARY TABLE t1 (a int);
CREATE OR REPLACE TEMPORARY TABLE t1 (a int, b int); CREATE OR REPLACE TEMPORARY TABLE t1 (a int, b int);
@ -104,6 +104,7 @@ create or replace table t1 as select a from (select a from t1) as t3;
--error ER_UPDATE_TABLE_USED --error ER_UPDATE_TABLE_USED
create or replace table t1 as select a from t2 where t2.a in (select a from t1); create or replace table t1 as select a from t2 where t2.a in (select a from t1);
drop table t1; drop table t1;
--enable_view_protocol
--echo # --echo #
--echo # Testing with normal tables --echo # Testing with normal tables
@ -126,6 +127,7 @@ CREATE OR REPLACE TABLE t1 AS SELECT 1;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
DROP TABLE t1; DROP TABLE t1;
--disable_service_connection
# Using lock tables with CREATE OR REPLACE # Using lock tables with CREATE OR REPLACE
CREATE OR REPLACE TABLE t1 (a int); CREATE OR REPLACE TABLE t1 (a int);
LOCK TABLES t1 write,t2 write; LOCK TABLES t1 write,t2 write;
@ -207,6 +209,7 @@ drop table t1,t3,t4;
--echo # Test the meta data locks are freed properly --echo # Test the meta data locks are freed properly
--echo # --echo #
--disable_view_protocol
create database mysqltest2; create database mysqltest2;
drop table if exists test.t1,mysqltest2.t2; drop table if exists test.t1,mysqltest2.t2;
@ -289,7 +292,7 @@ show tables;
select * from information_schema.metadata_lock_info; select * from information_schema.metadata_lock_info;
create table t1 (i int); create table t1 (i int);
drop table t1; drop table t1;
--enable_view_protocol
--echo # --echo #
--echo # Testing CREATE .. LIKE --echo # Testing CREATE .. LIKE
@ -507,6 +510,7 @@ CREATE OR REPLACE TEMPORARY TABLE t2(c INT DEFAULT '');
SELECT * FROM t3; SELECT * FROM t3;
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t3; DROP TABLE t3;
--enable_service_connection
--echo # End of 10.4 tests --echo # End of 10.4 tests

4
mysql-test/main/create_utf8.test
View File

@ -1,6 +1,7 @@
# #
# Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte # Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
# #
--disable_service_connection
set names utf8; set names utf8;
create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45; create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
@ -25,6 +26,7 @@ from имя_таблицы_в_кодировке_утф8_длиной_больш
# database, table, field, key, view # database, table, field, key, view
select * from имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48; select * from имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
--disable_view_protocol
--sorted_result --sorted_result
select TABLE_NAME from information_schema.tables where select TABLE_NAME from information_schema.tables where
table_schema='test'; table_schema='test';
@ -37,6 +39,7 @@ table_schema='test';
select TABLE_NAME from information_schema.views where select TABLE_NAME from information_schema.views where
table_schema='test'; table_schema='test';
--enable_view_protocol
show create table имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48; show create table имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
show create view имя_вью_кодировке_утф8_длиной_больше_чем_42; show create view имя_вью_кодировке_утф8_длиной_больше_чем_42;
@ -78,3 +81,4 @@ return 0;
drop view имя_вью_кодировке_утф8_длиной_больше_чем_42; drop view имя_вью_кодировке_утф8_длиной_больше_чем_42;
drop table имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48; drop table имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
set names default; set names default;
--enable_service_connection

6
mysql-test/main/cte_nonrecursive.test
View File

@ -1048,6 +1048,8 @@ drop table t1;
--echo # MDEV-16473: query with CTE when no database is set --echo # MDEV-16473: query with CTE when no database is set
--echo # --echo #
# Enable view protocol after fix MDEV-27944
--disable_view_protocol
create database db_mdev_16473; create database db_mdev_16473;
use db_mdev_16473; use db_mdev_16473;
drop database db_mdev_16473; drop database db_mdev_16473;
@ -1071,6 +1073,7 @@ select * from cte, db_mdev_16473.t1 as t where cte.a=t.a;
drop database db_mdev_16473; drop database db_mdev_16473;
use test; use test;
--enable_view_protocol
--echo # --echo #
--echo # MDEV-17154: using parameter markers for PS within CTEs more than once --echo # MDEV-17154: using parameter markers for PS within CTEs more than once
@ -1217,6 +1220,8 @@ DROP TABLE test.t;
--echo # MDEV-22781: create view with CTE without default database --echo # MDEV-22781: create view with CTE without default database
--echo # --echo #
# Enable view protocol after fix MDEV-27944
--disable_view_protocol
create database db; create database db;
use db; use db;
drop database db; drop database db;
@ -1242,6 +1247,7 @@ drop table db1.t1;
drop database db1; drop database db1;
use test; use test;
--enable_view_protocol
--echo # --echo #
--echo # MDEV-24597: CTE with union used multiple times in query --echo # MDEV-24597: CTE with union used multiple times in query

7
mysql-test/main/ctype_big5.test
View File

@ -79,6 +79,8 @@ create table t1 (a blob);
insert into t1 values (0xEE00); insert into t1 values (0xEE00);
select * into outfile 'test/t1.txt' from t1; select * into outfile 'test/t1.txt' from t1;
delete from t1; delete from t1;
#enable after fix MDEV-27871
--disable_view_protocol
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
--eval select hex(load_file('$MYSQLD_DATADIR/test/t1.txt')); --eval select hex(load_file('$MYSQLD_DATADIR/test/t1.txt'));
@ -86,7 +88,8 @@ load data infile 't1.txt' into table t1;
select hex(a) from t1; select hex(a) from t1;
--remove_file $MYSQLD_DATADIR/test/t1.txt --remove_file $MYSQLD_DATADIR/test/t1.txt
drop table t1; drop table t1;
#enable_view_protocol
#
--echo End of 5.0 tests --echo End of 5.0 tests
@ -240,12 +243,14 @@ DROP TABLE t1;
# #
# Checking binary->big5 conversion of an unassigned character 0xC840 in optimizer # Checking binary->big5 conversion of an unassigned character 0xC840 in optimizer
# #
--disable_service_connection
SET NAMES binary; SET NAMES binary;
CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET big5, KEY(a)); CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET big5, KEY(a));
INSERT INTO t1 VALUES (0xC840),(0xC841),(0xC842); INSERT INTO t1 VALUES (0xC840),(0xC841),(0xC842);
SELECT HEX(a) FROM t1 WHERE a='<27>@'; SELECT HEX(a) FROM t1 WHERE a='<27>@';
SELECT HEX(a) FROM t1 IGNORE KEY(a) WHERE a='<27>@'; SELECT HEX(a) FROM t1 IGNORE KEY(a) WHERE a='<27>@';
DROP TABLE t1; DROP TABLE t1;
--enable_service_connection
--echo # --echo #
--echo # End of 10.0 tests --echo # End of 10.0 tests

3
mysql-test/main/ctype_binary.test
View File

@ -1,4 +1,7 @@
#remove this include after fix MDEV-27871
--source include/no_view_protocol.inc
set names binary; set names binary;
--source include/ctype_numconv.inc --source include/ctype_numconv.inc

3
mysql-test/main/ctype_collate.test
View File

@ -1,3 +1,6 @@
#remove this include after fix MDEV-27871
--source include/no_view_protocol.inc
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;

3
mysql-test/main/ctype_cp932.test
View File

@ -4,6 +4,9 @@
--echo # USED. --echo # USED.
--echo # --echo #
#remove this include in 10.6 version
--source include/no_view_protocol.inc
SET @old_character_set_client= @@character_set_client; SET @old_character_set_client= @@character_set_client;
SET @old_character_set_connection= @@character_set_connection; SET @old_character_set_connection= @@character_set_connection;
SET @old_character_set_results= @@character_set_results; SET @old_character_set_results= @@character_set_results;

4
mysql-test/main/ctype_eucjpms.test
View File

@ -1,3 +1,7 @@
# remove this include in 10.6 version,
# if MDEV-27871 will be fix
--source include/no_view_protocol.inc
-- source include/have_eucjpms.inc -- source include/have_eucjpms.inc

3
mysql-test/main/ctype_filename.test
View File

@ -20,7 +20,10 @@ drop table com1;
create table `clock$` (a int); create table `clock$` (a int);
drop table `clock$`; drop table `clock$`;
# Enable after fix MDEV-29295
--disable_view_protocol
select convert(convert(',' using filename) using binary); select convert(convert(',' using filename) using binary);
--enable_view_protocol
--echo # --echo #
--echo # MDEV-7677 my_charset_handler_filename has a wrong "ismbchar" member --echo # MDEV-7677 my_charset_handler_filename has a wrong "ismbchar" member

4
mysql-test/main/ctype_gb2312.test
View File

@ -7,6 +7,8 @@
drop table if exists t1; drop table if exists t1;
--enable_warnings --enable_warnings
--disable_service_connection
SET @test_character_set= 'gb2312'; SET @test_character_set= 'gb2312';
SET @test_collation= 'gb2312_chinese_ci'; SET @test_collation= 'gb2312_chinese_ci';
-- source include/ctype_common.inc -- source include/ctype_common.inc
@ -178,6 +180,8 @@ let $coll='gb2312_nopad_bin';
let $coll_pad='gb2312_bin'; let $coll_pad='gb2312_bin';
--source include/ctype_pad_all_engines.inc --source include/ctype_pad_all_engines.inc
--enable_service_connection
--echo # --echo #
--echo # End of 10.2 tests --echo # End of 10.2 tests
--echo # --echo #

4
mysql-test/main/ctype_gbk.test
View File

@ -448,11 +448,13 @@ DROP TABLE t1;
--echo # --echo #
--echo # MDEV-7661 Unexpected result for: CAST(0xHHHH AS CHAR CHARACTER SET xxx) for incorrect byte sequences --echo # MDEV-7661 Unexpected result for: CAST(0xHHHH AS CHAR CHARACTER SET xxx) for incorrect byte sequences
--echo # --echo #
#enable after fix MDEV-27871
--disable_view_protocol
set sql_mode=''; set sql_mode='';
SELECT HEX(CAST(0xA341 AS CHAR CHARACTER SET gb2312)); SELECT HEX(CAST(0xA341 AS CHAR CHARACTER SET gb2312));
SELECT HEX(CONVERT(CAST(0xA341 AS CHAR CHARACTER SET gb2312) USING utf8)); SELECT HEX(CONVERT(CAST(0xA341 AS CHAR CHARACTER SET gb2312) USING utf8));
set sql_mode=default; set sql_mode=default;
--enable_view_protocol
--echo # --echo #
--echo # End of 10.1 tests --echo # End of 10.1 tests

4
mysql-test/main/ctype_latin1_de.test
View File

@ -1,6 +1,10 @@
# #
# Test latin_de character set # Test latin_de character set
# #
# Enable after fix MDEV-27904 and not earlier version 10.6
-- source include/no_view_protocol.inc
create database latin1_german2_ci default character set latin1 collate latin1_german2_ci; create database latin1_german2_ci default character set latin1 collate latin1_german2_ci;
use latin1_german2_ci; use latin1_german2_ci;

4
mysql-test/main/ctype_latin2.test
View File

@ -1,4 +1,3 @@
# Tests with the latin1 character set # Tests with the latin1 character set
# #
--disable_warnings --disable_warnings
@ -61,7 +60,7 @@ drop table t1;
--echo # --echo #
--echo # WL#3664 WEIGHT_STRING --echo # WL#3664 WEIGHT_STRING
--echo # --echo #
--disable_service_connection
set names latin2; set names latin2;
--source include/weight_string.inc --source include/weight_string.inc
--source include/weight_string_l1.inc --source include/weight_string_l1.inc
@ -70,6 +69,7 @@ set names latin2;
set collation_connection=latin2_bin; set collation_connection=latin2_bin;
--source include/weight_string.inc --source include/weight_string.inc
--source include/weight_string_l1.inc --source include/weight_string_l1.inc
--enable_service_connection
--echo # --echo #
--echo # End of 5.6 tests --echo # End of 5.6 tests

9
mysql-test/main/ctype_latin2_ch.test
View File

@ -30,10 +30,11 @@ select * from t1 where tt like '%AA%';
drop table t1; drop table t1;
# End of 4.1 tests # End of 4.1 tests
--disable_service_connection
set names latin2 collate latin2_czech_cs; set names latin2 collate latin2_czech_cs;
--source include/ctype_pad_space.inc --source include/ctype_pad_space.inc
--source include/ctype_like_cond_propagation.inc --source include/ctype_like_cond_propagation.inc
--enable_service_connection
# We can not use ctype_filesort.inc because # We can not use ctype_filesort.inc because
# order of SPACE and TAB is not strict # order of SPACE and TAB is not strict
@ -219,9 +220,10 @@ DROP TABLE t1;
--echo # --echo #
--echo # WL#3664 WEIGHT_STRING --echo # WL#3664 WEIGHT_STRING
--echo # --echo #
--disable_service_connection
set names latin2 collate latin2_czech_cs; set names latin2 collate latin2_czech_cs;
--source include/ctype_pad_space.inc --source include/ctype_pad_space.inc
--enable_service_connection
# We can not use ctype_filesort.inc because # We can not use ctype_filesort.inc because
# order of SPACE and TAB is not strict # order of SPACE and TAB is not strict
#--source include/ctype_filesort.inc #--source include/ctype_filesort.inc
@ -230,6 +232,8 @@ set names latin2 collate latin2_czech_cs;
--echo # Note: --echo # Note:
--echo # latin2_czech_cs does not support WEIGHT_STRING in full extent --echo # latin2_czech_cs does not support WEIGHT_STRING in full extent
--echo # --echo #
#check after fix MDEV-29290
--disable_view_protocol
--source include/weight_string.inc --source include/weight_string.inc
--source include/weight_string_chde.inc --source include/weight_string_chde.inc
--source include/weight_string_l1.inc --source include/weight_string_l1.inc
@ -238,6 +242,7 @@ set names latin2 collate latin2_czech_cs;
--source include/weight_string_l4.inc --source include/weight_string_l4.inc
--source include/weight_string_l12.inc --source include/weight_string_l12.inc
--source include/weight_string_l14.inc --source include/weight_string_l14.inc
--enable_view_protocol
--echo # --echo #
--echo # End of 5.6 tests --echo # End of 5.6 tests

3
mysql-test/main/ctype_ldml.test
View File

@ -3,6 +3,9 @@
--source include/have_utf16.inc --source include/have_utf16.inc
--source include/have_utf32.inc --source include/have_utf32.inc
#remove this include after fix MDEV-27871
--source include/no_view_protocol.inc
--disable_query_log --disable_query_log
call mtr.add_suppression("Charset id.*trying to replace"); call mtr.add_suppression("Charset id.*trying to replace");
--enable_query_log --enable_query_log

12
mysql-test/main/ctype_recoding.test
View File

@ -74,11 +74,13 @@ SHOW TABLES IN
SET CHARACTER SET koi8r; SET CHARACTER SET koi8r;
DROP DATABASE <20><><EFBFBD><EFBFBD>; DROP DATABASE <20><><EFBFBD><EFBFBD>;
# Enable view protocol after fix MDEV-27944
--disable_view_protocol
SET NAMES koi8r; SET NAMES koi8r;
SELECT hex('<27><><EFBFBD><EFBFBD>'); SELECT hex('<27><><EFBFBD><EFBFBD>');
SET character_set_connection=cp1251; SET character_set_connection=cp1251;
SELECT hex('<27><><EFBFBD><EFBFBD>'); SELECT hex('<27><><EFBFBD><EFBFBD>');
--enable_view_protocol
USE test; USE test;
# Bug#4417 # Bug#4417
@ -94,9 +96,12 @@ DROP TABLE `тест`;
SET NAMES binary; SET NAMES binary;
SET character_set_connection=utf8; SET character_set_connection=utf8;
SELECT 'тест' as s; SELECT 'тест' as s;
# enable view-protocol in 10.6 version
--disable_view_protocol
SET NAMES utf8; SET NAMES utf8;
SET character_set_connection=binary; SET character_set_connection=binary;
SELECT 'тест' as s; SELECT 'тест' as s;
--enable_view_protocol
# Bug#4417, another aspect: # Bug#4417, another aspect:
# Check that both "SHOW CREATE TABLE" and "SHOW COLUMNS" # Check that both "SHOW CREATE TABLE" and "SHOW COLUMNS"
@ -173,6 +178,8 @@ drop table t1;
# #
# Check more automatic conversion # Check more automatic conversion
# #
# Enable view protocol after fix MDEV-28017
--disable_view_protocol
set names koi8r; set names koi8r;
create table t1 (c1 char(10) character set cp1251); create table t1 (c1 char(10) character set cp1251);
insert into t1 values ('<27>'); insert into t1 values ('<27>');
@ -197,7 +204,8 @@ select rpad(c1,3,'
#select case c1 when '<27>' then '<27>' when '<27>' then '<27>' else 'c' end from t1; #select case c1 when '<27>' then '<27>' when '<27>' then '<27>' else 'c' end from t1;
#select export_set(5,c1,'<27>'), export_set(5,'<27>',c1) from t1; #select export_set(5,c1,'<27>'), export_set(5,'<27>',c1) from t1;
drop table t1; drop table t1;
--enable_view_protocol
# #
# Bug 20695: problem with field default value's character set # Bug 20695: problem with field default value's character set
# #

18
mysql-test/main/ctype_sjis.test
View File

@ -64,6 +64,7 @@ select hex(c) from t1;
drop table t1; drop table t1;
--disable_service_connection
SET collation_connection='sjis_japanese_ci'; SET collation_connection='sjis_japanese_ci';
-- source include/ctype_filesort.inc -- source include/ctype_filesort.inc
-- source include/ctype_innodb_like.inc -- source include/ctype_innodb_like.inc
@ -77,6 +78,7 @@ SET collation_connection='sjis_bin';
-- source include/ctype_like_escape.inc -- source include/ctype_like_escape.inc
-- source include/ctype_like_range_f1f2.inc -- source include/ctype_like_range_f1f2.inc
-- source include/ctype_ascii_order.inc -- source include/ctype_ascii_order.inc
--enable_service_connection
# Check parsing of string literals in SJIS with multibyte characters that # Check parsing of string literals in SJIS with multibyte characters that
# have an embedded \ in them. (Bug #8303) # have an embedded \ in them. (Bug #8303)
@ -175,6 +177,8 @@ WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
--echo # WL#3090 Japanese Character Set adjustments --echo # WL#3090 Japanese Character Set adjustments
--echo # Test sjis->Unicode conversion --echo # Test sjis->Unicode conversion
--echo # --echo #
# enable view-protocol in 10.6 version
--disable_view_protocol
SELECT HEX(a), HEX(CONVERT(a USING utf8)) as b FROM t1 SELECT HEX(a), HEX(CONVERT(a USING utf8)) as b FROM t1
WHERE a<>'' HAVING b<>'3F' ORDER BY code; WHERE a<>'' HAVING b<>'3F' ORDER BY code;
@ -189,6 +193,7 @@ DROP TABLE t1;
SELECT HEX(a), HEX(CONVERT(a using sjis)) as b FROM t1 HAVING b<>'3F' ORDER BY BINARY a; SELECT HEX(a), HEX(CONVERT(a using sjis)) as b FROM t1 HAVING b<>'3F' ORDER BY BINARY a;
DROP TABLE t1; DROP TABLE t1;
--enable_view_protocol
--echo # --echo #
--echo # End of 5.5 tests --echo # End of 5.5 tests
@ -203,6 +208,9 @@ DROP TABLE t1;
--echo # WL#3664 WEIGHT_STRING --echo # WL#3664 WEIGHT_STRING
--echo # --echo #
# enable view-protocol after fix MDEV-27871
--disable_view_protocol
set names sjis; set names sjis;
--source include/weight_string.inc --source include/weight_string.inc
--source include/weight_string_l1.inc --source include/weight_string_l1.inc
@ -214,6 +222,8 @@ set collation_connection=sjis_bin;
--source include/weight_string_l1.inc --source include/weight_string_l1.inc
--source include/weight_string_8140.inc --source include/weight_string_8140.inc
--enable_view_protocol
--echo # --echo #
--echo # End of 5.6 tests --echo # End of 5.6 tests
--echo # --echo #
@ -222,13 +232,21 @@ set collation_connection=sjis_bin;
--echo # Start of 10.0 tests --echo # Start of 10.0 tests
--echo # --echo #
# Tests will be skipped for the view protocol because the view protocol creates
# an additional util connection and other statistics data
# (it is necessary to run the view-protocol not in util session )
--disable_view_protocol
let $ctype_unescape_combinations=selected; let $ctype_unescape_combinations=selected;
--source include/ctype_unescape.inc --source include/ctype_unescape.inc
--character_set sjis --character_set sjis
SET NAMES sjis; SET NAMES sjis;
--source include/ctype_E05C.inc --source include/ctype_E05C.inc
--enable_view_protocol
--echo # --echo #
--echo # End of 10.0 tests --echo # End of 10.0 tests

7
mysql-test/main/ctype_swe7.test
View File

@ -11,9 +11,16 @@ SET NAMES swe7;
# as uses stored functions actively. # as uses stored functions actively.
# #
# Tests will be skipped for the view protocol because the view protocol creates
# an additional util connection and other statistics data
# (it is necessary to run the view-protocol not in util session )
--disable_service_connection
let $ctype_unescape_combinations=selected; let $ctype_unescape_combinations=selected;
--source include/ctype_unescape.inc --source include/ctype_unescape.inc
--enable_service_connection
--echo # --echo #
--echo # End of 10.0 tests --echo # End of 10.0 tests
--echo # --echo #

6
mysql-test/main/ctype_tis620.test
View File

@ -169,7 +169,7 @@ SET collation_connection='tis620_bin';
--echo # --echo #
--echo # Start of 5.6 tests --echo # Start of 5.6 tests
--echo # --echo #
--disable_service_connection
--echo # --echo #
--echo # WL#3664 WEIGHT_STRING --echo # WL#3664 WEIGHT_STRING
--echo # --echo #
@ -186,8 +186,11 @@ set collation_connection=tis620_bin;
--source include/weight_string.inc --source include/weight_string.inc
--source include/weight_string_l1.inc --source include/weight_string_l1.inc
--source include/ctype_pad_space.inc --source include/ctype_pad_space.inc
#enable after fix MDEV-29290
--disable_view_protocol
select hex(weight_string(cast(0xE0A1 as char))); select hex(weight_string(cast(0xE0A1 as char)));
select hex(weight_string(cast(0xE0A1 as char) as char(1))); select hex(weight_string(cast(0xE0A1 as char) as char(1)));
--enable_view_protocol
--echo # --echo #
--echo # End of 5.6 tests --echo # End of 5.6 tests
@ -208,6 +211,7 @@ let $coll_pad='tis620_thai_ci';
let $coll='tis620_nopad_bin'; let $coll='tis620_nopad_bin';
let $coll_pad='tis620_bin'; let $coll_pad='tis620_bin';
--source include/ctype_pad_all_engines.inc --source include/ctype_pad_all_engines.inc
--enable_service_connection
--echo # --echo #
--echo # MDEV-24901 SIGSEGV in fts_get_table_name, SIGSEGV in ib_vector_size, SIGSEGV in row_merge_fts_doc_tokenize, stack smashing --echo # MDEV-24901 SIGSEGV in fts_get_table_name, SIGSEGV in ib_vector_size, SIGSEGV in row_merge_fts_doc_tokenize, stack smashing

14
mysql-test/main/ctype_uca.test
View File

@ -8,6 +8,7 @@ DROP TABLE IF EXISTS t1;
# #
# Test Unicode collations. # Test Unicode collations.
# #
--disable_service_connection
set names utf8; set names utf8;
# #
@ -72,6 +73,7 @@ select group_concat(c1 order by c1) from t1 group by c1 collate utf8_unicode_520
select group_concat(c1 order by c1) from t1 group by c1 collate utf8_vietnamese_ci; select group_concat(c1 order by c1) from t1 group by c1 collate utf8_vietnamese_ci;
select group_concat(c1 order by c1) from t1 group by c1 collate utf8_thai_520_w2; select group_concat(c1 order by c1) from t1 group by c1 collate utf8_thai_520_w2;
--disable_view_protocol
ALTER TABLE t1 CONVERT TO CHARACTER SET ucs2 COLLATE ucs2_bin; ALTER TABLE t1 CONVERT TO CHARACTER SET ucs2 COLLATE ucs2_bin;
SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_unicode_ci; SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_unicode_ci;
SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_icelandic_ci; SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_icelandic_ci;
@ -96,7 +98,7 @@ SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_croatian_ci
SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_german2_ci; SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_german2_ci;
SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_unicode_520_ci; SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_unicode_520_ci;
SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_vietnamese_ci; SELECT GROUP_CONCAT(c1 ORDER BY c1) FROM t1 GROUP BY c1 COLLATE ucs2_vietnamese_ci;
--enable_view_protocol
drop table t1; drop table t1;
# #
@ -475,7 +477,7 @@ set collation_connection=ucs2_unicode_ci;
-- source include/ctype_regex.inc -- source include/ctype_regex.inc
-- source include/ctype_like_range_f1f2.inc -- source include/ctype_like_range_f1f2.inc
set names utf8; set names utf8;
--enable_service_connection
-- echo End for 5.0 tests -- echo End for 5.0 tests
--echo End of 5.1 tests --echo End of 5.1 tests
@ -491,7 +493,7 @@ SET collation_connection=utf8_czech_ci;
SET collation_connection=ucs2_czech_ci; SET collation_connection=ucs2_czech_ci;
--source include/ctype_czech.inc --source include/ctype_czech.inc
--source include/ctype_like_ignorable.inc --source include/ctype_like_ignorable.inc
--disable_service_connection
create table t1 (a int, c1 varchar(200) collate utf8_croatian_mysql561_ci, key (c1)); create table t1 (a int, c1 varchar(200) collate utf8_croatian_mysql561_ci, key (c1));
insert into t1 values (1,'=> DZ'),(2,'=> Dz'),(3,'=> dz'),(4,'=> dZ'); insert into t1 values (1,'=> DZ'),(2,'=> Dz'),(3,'=> dz'),(4,'=> dZ');
insert into t1 values (5,'=> DŽ'),(6,'=> Dž'),(7,'=> dž'),(8,'=> dŽ'); insert into t1 values (5,'=> DŽ'),(6,'=> Dž'),(7,'=> dž'),(8,'=> dŽ');
@ -508,7 +510,6 @@ select * from t1 where c1 = '=> dž';
select * from t1 where concat(c1) = '=> dž'; select * from t1 where concat(c1) = '=> dž';
drop table t1; drop table t1;
--echo # --echo #
--echo # MDEV-7649 wrong result when comparing utf8 column with an invalid literal --echo # MDEV-7649 wrong result when comparing utf8 column with an invalid literal
--echo # --echo #
@ -551,7 +552,10 @@ set @@collation_connection=ucs2_czech_ci;
--echo # --echo #
--echo # Bug#33077 weight of supplementary characters is not 0xfffd --echo # Bug#33077 weight of supplementary characters is not 0xfffd
--echo # --echo #
#enable_after_fix MDEV-27871
--disable_view_protocol
select hex(weight_string(_utf8mb4 0xF0908080 /* U+10000 */ collate utf8mb4_unicode_ci)); select hex(weight_string(_utf8mb4 0xF0908080 /* U+10000 */ collate utf8mb4_unicode_ci));
--enable_view_protocol
--echo # --echo #
--echo # Bug#53064 garbled data when using utf8_german2_ci collation --echo # Bug#53064 garbled data when using utf8_german2_ci collation
@ -690,7 +694,7 @@ CREATE VIEW v1 AS SELECT group_concat('f') AS col1;
SELECT col1 FROM v1 UNION SELECT col1 FROM t1; SELECT col1 FROM v1 UNION SELECT col1 FROM t1;
DROP VIEW v1; DROP VIEW v1;
DROP TABLE t1; DROP TABLE t1;
--enable_service_connection
--echo # --echo #
--echo # End of MariaDB-10.2 tests --echo # End of MariaDB-10.2 tests

4
mysql-test/main/ctype_uca_innodb.test
View File

@ -1,7 +1,6 @@
# #
# Tests for UCA collations with InnoDB # Tests for UCA collations with InnoDB
# #
let collation=utf8mb3_unicode_ci; let collation=utf8mb3_unicode_ci;
--source include/have_collation.inc --source include/have_collation.inc
--source include/have_innodb.inc --source include/have_innodb.inc
@ -15,10 +14,11 @@ let collation=utf8mb3_unicode_ci;
--echo # --echo #
--echo # MDEV-7649 wrong result when comparing utf8 column with an invalid literal --echo # MDEV-7649 wrong result when comparing utf8 column with an invalid literal
--echo # --echo #
--disable_service_connection
SET NAMES utf8 COLLATE utf8_unicode_ci; SET NAMES utf8 COLLATE utf8_unicode_ci;
--let ENGINE=InnoDB --let ENGINE=InnoDB
--source include/ctype_utf8_ilseq.inc --source include/ctype_utf8_ilseq.inc
--enable_service_connection
--echo # --echo #
--echo # End of 5.5 tests --echo # End of 5.5 tests

18
mysql-test/main/ctype_ujis.test
View File

@ -47,7 +47,12 @@ select locate(_ujis 0xa1a3,_ujis 0xa1a2a1a3);
select 0xa1a2a1a3 like concat(_binary'%',0xa2a1,_binary'%'); select 0xa1a2a1a3 like concat(_binary'%',0xa2a1,_binary'%');
select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%'); select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%');
# enable view-protocol after fix MDEV-27871
--disable_view_protocol
select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') collate ujis_bin; select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') collate ujis_bin;
--disable_view_protocol
select 'a' like 'a'; select 'a' like 'a';
select 'A' like 'a'; select 'A' like 'a';
select 'A' like 'a' collate ujis_bin; select 'A' like 'a' collate ujis_bin;
@ -1226,9 +1231,11 @@ DROP TABLE t2;
--echo # --echo #
--echo # Bug#57257 Replace(ExtractValue(...)) causes MySQL crash --echo # Bug#57257 Replace(ExtractValue(...)) causes MySQL crash
--echo # --echo #
#enable after fix MDEV-27871
--disable_view_protocol
SET NAMES utf8; SET NAMES utf8;
SELECT CONVERT(REPLACE(EXPORT_SET('a','a','a','','a'),'00','') USING ujis); SELECT CONVERT(REPLACE(EXPORT_SET('a','a','a','','a'),'00','') USING ujis);
--enable_view_protocol
set names default; set names default;
set character_set_database=@save_character_set_server; set character_set_database=@save_character_set_server;
@ -1317,6 +1324,10 @@ WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
--echo # WL#3090 Japanese Character Set adjustments --echo # WL#3090 Japanese Character Set adjustments
--echo # Test sjis->Unicode conversion --echo # Test sjis->Unicode conversion
--echo # --echo #
# enable view-protocol in 10.6 version
--disable_view_protocol
SELECT HEX(a), HEX(CONVERT(a USING utf8)) as b FROM t1 SELECT HEX(a), HEX(CONVERT(a USING utf8)) as b FROM t1
WHERE a<>'' HAVING b<>'3F' ORDER BY code; WHERE a<>'' HAVING b<>'3F' ORDER BY code;
@ -1331,7 +1342,7 @@ DROP TABLE t1;
SELECT HEX(a), HEX(CONVERT(a using sjis)) as b FROM t1 HAVING b<>'3F' ORDER BY BINARY a; SELECT HEX(a), HEX(CONVERT(a using sjis)) as b FROM t1 HAVING b<>'3F' ORDER BY BINARY a;
DROP TABLE t1; DROP TABLE t1;
--enable_view_protocol
--echo # --echo #
--echo # End of 5.5 tests --echo # End of 5.5 tests
@ -1346,6 +1357,8 @@ DROP TABLE t1;
--echo # WL#3664 WEIGHT_STRING --echo # WL#3664 WEIGHT_STRING
--echo # --echo #
# enable view-protocol after fix MDEV-27871
--disable_view_protocol
set names ujis; set names ujis;
--source include/weight_string.inc --source include/weight_string.inc
--source include/weight_string_l1.inc --source include/weight_string_l1.inc
@ -1359,6 +1372,7 @@ set collation_connection=ujis_bin;
--source include/weight_string_A1A1.inc --source include/weight_string_A1A1.inc
--source include/weight_string_8EA1.inc --source include/weight_string_8EA1.inc
--source include/weight_string_8FA2C3.inc --source include/weight_string_8FA2C3.inc
--enable_view_protocol
--echo # --echo #
--echo # End of 5.6 tests --echo # End of 5.6 tests

12
mysql-test/main/ctype_upgrade.test
View File

@ -85,13 +85,15 @@ DROP TABLE maria050533_xxx_croatian_ci;
--copy_file std_data/ctype_upgrade/maria050533_xxx_croatian_ci.MYI $MYSQLD_DATADIR/test/maria050533_xxx_croatian_ci.MYI --copy_file std_data/ctype_upgrade/maria050533_xxx_croatian_ci.MYI $MYSQLD_DATADIR/test/maria050533_xxx_croatian_ci.MYI
ALTER TABLE maria050533_xxx_croatian_ci FORCE; ALTER TABLE maria050533_xxx_croatian_ci FORCE;
SHOW CREATE TABLE maria050533_xxx_croatian_ci; SHOW CREATE TABLE maria050533_xxx_croatian_ci;
# enable after fix MDEV-28571
--disable_view_protocol
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM maria050533_xxx_croatian_ci GROUP BY a; SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM maria050533_xxx_croatian_ci GROUP BY a;
SELECT GROUP_CONCAT(b ORDER BY BINARY b) FROM maria050533_xxx_croatian_ci GROUP BY b; SELECT GROUP_CONCAT(b ORDER BY BINARY b) FROM maria050533_xxx_croatian_ci GROUP BY b;
SELECT GROUP_CONCAT(c ORDER BY BINARY c) FROM maria050533_xxx_croatian_ci GROUP BY c; SELECT GROUP_CONCAT(c ORDER BY BINARY c) FROM maria050533_xxx_croatian_ci GROUP BY c;
SELECT GROUP_CONCAT(d ORDER BY BINARY d) FROM maria050533_xxx_croatian_ci GROUP BY d; SELECT GROUP_CONCAT(d ORDER BY BINARY d) FROM maria050533_xxx_croatian_ci GROUP BY d;
SELECT GROUP_CONCAT(e ORDER BY BINARY e) FROM maria050533_xxx_croatian_ci GROUP BY e; SELECT GROUP_CONCAT(e ORDER BY BINARY e) FROM maria050533_xxx_croatian_ci GROUP BY e;
DROP TABLE maria050533_xxx_croatian_ci; DROP TABLE maria050533_xxx_croatian_ci;
--enable_view_protocol
--echo # --echo #
--echo # Upgrade from Maria-10.0.4 --echo # Upgrade from Maria-10.0.4
@ -116,13 +118,15 @@ DROP TABLE maria100004_xxx_croatian_ci;
--copy_file std_data/ctype_upgrade/maria100004_xxx_croatian_ci.MYI $MYSQLD_DATADIR/test/maria100004_xxx_croatian_ci.MYI --copy_file std_data/ctype_upgrade/maria100004_xxx_croatian_ci.MYI $MYSQLD_DATADIR/test/maria100004_xxx_croatian_ci.MYI
ALTER TABLE maria100004_xxx_croatian_ci FORCE; ALTER TABLE maria100004_xxx_croatian_ci FORCE;
SHOW CREATE TABLE maria100004_xxx_croatian_ci; SHOW CREATE TABLE maria100004_xxx_croatian_ci;
# enable after fix MDEV-28571
--disable_view_protocol
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM maria100004_xxx_croatian_ci GROUP BY a; SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM maria100004_xxx_croatian_ci GROUP BY a;
SELECT GROUP_CONCAT(b ORDER BY BINARY b) FROM maria100004_xxx_croatian_ci GROUP BY b; SELECT GROUP_CONCAT(b ORDER BY BINARY b) FROM maria100004_xxx_croatian_ci GROUP BY b;
SELECT GROUP_CONCAT(c ORDER BY BINARY c) FROM maria100004_xxx_croatian_ci GROUP BY c; SELECT GROUP_CONCAT(c ORDER BY BINARY c) FROM maria100004_xxx_croatian_ci GROUP BY c;
SELECT GROUP_CONCAT(d ORDER BY BINARY d) FROM maria100004_xxx_croatian_ci GROUP BY d; SELECT GROUP_CONCAT(d ORDER BY BINARY d) FROM maria100004_xxx_croatian_ci GROUP BY d;
SELECT GROUP_CONCAT(e ORDER BY BINARY e) FROM maria100004_xxx_croatian_ci GROUP BY e; SELECT GROUP_CONCAT(e ORDER BY BINARY e) FROM maria100004_xxx_croatian_ci GROUP BY e;
DROP TABLE maria100004_xxx_croatian_ci; DROP TABLE maria100004_xxx_croatian_ci;
--enable_view_protocol
--echo # --echo #
@ -137,13 +141,15 @@ DROP TABLE maria100004_xxx_croatian_ci;
--copy_file std_data/ctype_upgrade/mysql050614_xxx_croatian_ci.MYI $MYSQLD_DATADIR/test/mysql050614_xxx_croatian_ci.MYI --copy_file std_data/ctype_upgrade/mysql050614_xxx_croatian_ci.MYI $MYSQLD_DATADIR/test/mysql050614_xxx_croatian_ci.MYI
CHECK TABLE mysql050614_xxx_croatian_ci FOR UPGRADE; CHECK TABLE mysql050614_xxx_croatian_ci FOR UPGRADE;
SHOW CREATE TABLE mysql050614_xxx_croatian_ci; SHOW CREATE TABLE mysql050614_xxx_croatian_ci;
# enable after fix MDEV-28571
--disable_view_protocol
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM mysql050614_xxx_croatian_ci GROUP BY a; SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM mysql050614_xxx_croatian_ci GROUP BY a;
SELECT GROUP_CONCAT(b ORDER BY BINARY b) FROM mysql050614_xxx_croatian_ci GROUP BY b; SELECT GROUP_CONCAT(b ORDER BY BINARY b) FROM mysql050614_xxx_croatian_ci GROUP BY b;
SELECT GROUP_CONCAT(c ORDER BY BINARY c) FROM mysql050614_xxx_croatian_ci GROUP BY c; SELECT GROUP_CONCAT(c ORDER BY BINARY c) FROM mysql050614_xxx_croatian_ci GROUP BY c;
SELECT GROUP_CONCAT(d ORDER BY BINARY d) FROM mysql050614_xxx_croatian_ci GROUP BY d; SELECT GROUP_CONCAT(d ORDER BY BINARY d) FROM mysql050614_xxx_croatian_ci GROUP BY d;
SELECT GROUP_CONCAT(e ORDER BY BINARY e) FROM mysql050614_xxx_croatian_ci GROUP BY e; SELECT GROUP_CONCAT(e ORDER BY BINARY e) FROM mysql050614_xxx_croatian_ci GROUP BY e;
DROP TABLE mysql050614_xxx_croatian_ci; DROP TABLE mysql050614_xxx_croatian_ci;
--enable_view_protocol
--echo # --echo #
--echo # Checking mysql_upgrade --echo # Checking mysql_upgrade

9
mysql-test/main/ctype_utf16.test
View File

@ -1,7 +1,6 @@
-- source include/have_utf16.inc -- source include/have_utf16.inc
-- source include/have_utf8mb4.inc -- source include/have_utf8mb4.inc
SET TIME_ZONE='+03:00'; SET TIME_ZONE='+03:00';
--disable_warnings --disable_warnings
@ -11,6 +10,7 @@ DROP TABLE IF EXISTS t1;
--echo # --echo #
--echo # Start of 5.5 tests --echo # Start of 5.5 tests
--echo # --echo #
--disable_service_connection
SET NAMES latin1; SET NAMES latin1;
SET character_set_connection=utf16; SET character_set_connection=utf16;
@ -52,6 +52,8 @@ DROP TABLE t1;
# #
# Check LPAD/RPAD # Check LPAD/RPAD
# #
#enable after fix MDEV-29290
--disable_view_protocol
SELECT hex(LPAD(_utf16 X'0420',10,_utf16 X'0421')); SELECT hex(LPAD(_utf16 X'0420',10,_utf16 X'0421'));
SELECT hex(LPAD(_utf16 X'0420',10,_utf16 X'04210422')); SELECT hex(LPAD(_utf16 X'0420',10,_utf16 X'04210422'));
SELECT hex(LPAD(_utf16 X'0420',10,_utf16 X'042104220423')); SELECT hex(LPAD(_utf16 X'0420',10,_utf16 X'042104220423'));
@ -65,6 +67,7 @@ SELECT hex(RPAD(_utf16 X'0420',10,_utf16 X'042104220423'));
SELECT hex(RPAD(_utf16 X'0420042104220423042404250426042704280429042A042B',10,_utf16 X'042104220423')); SELECT hex(RPAD(_utf16 X'0420042104220423042404250426042704280429042A042B',10,_utf16 X'042104220423'));
SELECT hex(RPAD(_utf16 X'D800DC00', 10, _utf16 X'0421')); SELECT hex(RPAD(_utf16 X'D800DC00', 10, _utf16 X'0421'));
SELECT hex(RPAD(_utf16 X'0421', 10, _utf16 X'D800DC00')); SELECT hex(RPAD(_utf16 X'0421', 10, _utf16 X'D800DC00'));
--enable_view_protocol
CREATE TABLE t1 SELECT CREATE TABLE t1 SELECT
LPAD(_utf16 X'0420',10,_utf16 X'0421') l, LPAD(_utf16 X'0420',10,_utf16 X'0421') l,
@ -738,6 +741,7 @@ CREATE TABLE t1 (
s3 MEDIUMTEXT CHARACTER SET utf16, s3 MEDIUMTEXT CHARACTER SET utf16,
s4 LONGTEXT CHARACTER SET utf16 s4 LONGTEXT CHARACTER SET utf16
); );
--disable_view_protocol
--enable_metadata --enable_metadata
SET NAMES utf8, @@character_set_results=NULL; SET NAMES utf8, @@character_set_results=NULL;
SELECT *, HEX(s1) FROM t1; SELECT *, HEX(s1) FROM t1;
@ -746,6 +750,7 @@ SELECT *, HEX(s1) FROM t1;
SET NAMES utf8; SET NAMES utf8;
SELECT *, HEX(s1) FROM t1; SELECT *, HEX(s1) FROM t1;
--disable_metadata --disable_metadata
--enable_view_protocol
CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1; CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1;
SHOW CREATE TABLE t2; SHOW CREATE TABLE t2;
DROP TABLE t1, t2; DROP TABLE t1, t2;
@ -950,7 +955,7 @@ DROP TABLE t1;
VALUES (1) UNION SELECT _utf16 0x0020; VALUES (1) UNION SELECT _utf16 0x0020;
VALUES ('') UNION SELECT _utf16 0x0020 COLLATE utf16_bin; VALUES ('') UNION SELECT _utf16 0x0020 COLLATE utf16_bin;
VALUES ('') UNION VALUES ( _utf16 0x0020 COLLATE utf16_bin); VALUES ('') UNION VALUES ( _utf16 0x0020 COLLATE utf16_bin);
--enable_service_connection
--echo # --echo #
--echo # End of 10.3 tests --echo # End of 10.3 tests

3
mysql-test/main/ctype_utf16_uca.test
View File

@ -9,6 +9,7 @@ DROP TABLE IF EXISTS t1;
--echo # Start of 5.5 tests --echo # Start of 5.5 tests
--echo # --echo #
--disable_service_connection
set names utf8; set names utf8;
set collation_connection=utf16_unicode_ci; set collation_connection=utf16_unicode_ci;
select hex('a'), hex('a '); select hex('a'), hex('a ');
@ -267,7 +268,7 @@ INSERT INTO t1 (c) VALUES (1);
SELECT HEX(c) FROM t1; SELECT HEX(c) FROM t1;
DROP TABLE t1; DROP TABLE t1;
--enable_service_connection
--echo # --echo #
--echo # End of 10.2 tests --echo # End of 10.2 tests
--echo # --echo #

5
mysql-test/main/ctype_utf16le.test
View File

@ -3,6 +3,8 @@
-- source include/have_utf32.inc -- source include/have_utf32.inc
-- source include/have_utf8mb4.inc -- source include/have_utf8mb4.inc
--disable_service_connection
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
SET TIME_ZONE='+03:00'; SET TIME_ZONE='+03:00';
@ -701,6 +703,7 @@ CREATE TABLE t1 (
s3 MEDIUMTEXT CHARACTER SET utf16le, s3 MEDIUMTEXT CHARACTER SET utf16le,
s4 LONGTEXT CHARACTER SET utf16le s4 LONGTEXT CHARACTER SET utf16le
); );
--disable_view_protocol
--enable_metadata --enable_metadata
SET NAMES utf8, @@character_set_results=NULL; SET NAMES utf8, @@character_set_results=NULL;
SELECT *, HEX(s1) FROM t1; SELECT *, HEX(s1) FROM t1;
@ -709,6 +712,7 @@ SELECT *, HEX(s1) FROM t1;
SET NAMES utf8; SET NAMES utf8;
SELECT *, HEX(s1) FROM t1; SELECT *, HEX(s1) FROM t1;
--disable_metadata --disable_metadata
--enable_view_protocol
CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1; CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1;
SHOW CREATE TABLE t2; SHOW CREATE TABLE t2;
DROP TABLE t1, t2; DROP TABLE t1, t2;
@ -846,6 +850,7 @@ SELECT TABLE_NAME, TABLE_SCHEMA, HEX(TABLE_NAME) FROM INFORMATION_SCHEMA.TABLES
DROP TABLE t; DROP TABLE t;
SET NAMES utf8; SET NAMES utf8;
--enable_service_connection
--echo # --echo #
--echo # End of 10.2 tests --echo # End of 10.2 tests

18
mysql-test/main/ctype_utf32.test
View File

@ -1,6 +1,7 @@
-- source include/have_utf32.inc -- source include/have_utf32.inc
-- source include/have_utf8mb4.inc -- source include/have_utf8mb4.inc
--disable_service_connection
SET TIME_ZONE = '+03:00'; SET TIME_ZONE = '+03:00';
--disable_warnings --disable_warnings
@ -62,12 +63,18 @@ DROP TABLE t1;
SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0421')); SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0421'));
SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0000042100000422')); SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0000042100000422'));
SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423')); SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423'));
#enable after fix MDEV-27871
--disable_view_protocol
SELECT hex(LPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423')); SELECT hex(LPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423'));
--enable_view_protocol
SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0421')); SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0421'));
SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0000042100000422')); SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0000042100000422'));
SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423')); SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423'));
#enable after fix MDEV-27871
--disable_view_protocol
SELECT hex(RPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423')); SELECT hex(RPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423'));
--enable_view_protocol
CREATE TABLE t1 SELECT CREATE TABLE t1 SELECT
LPAD(_utf32 X'0420',10,_utf32 X'0421') l, LPAD(_utf32 X'0420',10,_utf32 X'0421') l,
@ -117,8 +124,11 @@ DROP TABLE t1;
# #
# Check that INSERT() works fine. # Check that INSERT() works fine.
# This invokes charpos() function. # This invokes charpos() function.
#enable after fix MDEV-27871
--disable_view_protocol
select insert(_utf32 0x000000610000006200000063,10,2,_utf32 0x000000640000006500000066); select insert(_utf32 0x000000610000006200000063,10,2,_utf32 0x000000640000006500000066);
select insert(_utf32 0x000000610000006200000063,1,2,_utf32 0x000000640000006500000066); select insert(_utf32 0x000000610000006200000063,1,2,_utf32 0x000000640000006500000066);
--enable_view_protocol
####################################################### #######################################################
@ -794,6 +804,7 @@ CREATE TABLE t1 (
s3 MEDIUMTEXT CHARACTER SET utf32, s3 MEDIUMTEXT CHARACTER SET utf32,
s4 LONGTEXT CHARACTER SET utf32 s4 LONGTEXT CHARACTER SET utf32
); );
--disable_view_protocol
--enable_metadata --enable_metadata
SET NAMES utf8mb4, @@character_set_results=NULL; SET NAMES utf8mb4, @@character_set_results=NULL;
SELECT *, HEX(s1) FROM t1; SELECT *, HEX(s1) FROM t1;
@ -802,6 +813,7 @@ SELECT *, HEX(s1) FROM t1;
SET NAMES utf8mb4; SET NAMES utf8mb4;
SELECT *, HEX(s1) FROM t1; SELECT *, HEX(s1) FROM t1;
--disable_metadata --disable_metadata
--enable_view_protocol
CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1; CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1;
SHOW CREATE TABLE t2; SHOW CREATE TABLE t2;
DROP TABLE t1, t2; DROP TABLE t1, t2;
@ -872,8 +884,10 @@ ORDER BY l DESC;
--echo # --echo #
--echo # incorrect charset for val_str_ascii --echo # incorrect charset for val_str_ascii
--echo # --echo #
#enable after fix MDEV-27871
--disable_view_protocol
SELECT '2010-10-10 10:10:10' + INTERVAL GeometryType(GeomFromText('POINT(1 1)')) hour_second; SELECT '2010-10-10 10:10:10' + INTERVAL GeometryType(GeomFromText('POINT(1 1)')) hour_second;
--enable_view_protocol
--echo # --echo #
--echo # MDEV-5745 analyze MySQL fix for bug#12368495 --echo # MDEV-5745 analyze MySQL fix for bug#12368495
@ -1085,7 +1099,7 @@ CREATE TABLE t1 (
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
DROP TABLE t1; DROP TABLE t1;
--enable_service_connection
--echo # --echo #
--echo # End of 10.2 tests --echo # End of 10.2 tests
--echo # --echo #

2
mysql-test/main/ctype_utf32_uca.test
View File

@ -8,6 +8,7 @@ DROP TABLE IF EXISTS t1;
--echo # --echo #
--echo # Start of 5.5 tests --echo # Start of 5.5 tests
--echo # --echo #
--disable_service_connection
set names utf8; set names utf8;
set collation_connection=utf32_unicode_ci; set collation_connection=utf32_unicode_ci;
@ -303,6 +304,7 @@ SHOW CREATE TABLE t1;
DROP TABLE t1; DROP TABLE t1;
SET NAMES utf8; SET NAMES utf8;
--enable_service_connection
--echo # --echo #
--echo # End of 10.2 tests --echo # End of 10.2 tests

3
mysql-test/main/ctype_utf8.test
View File

@ -2,6 +2,9 @@
# Tests with the utf8 character set # Tests with the utf8 character set
# #
# Enable after fix MDEV-27904
-- source include/no_view_protocol.inc
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
let collation=utf8mb3_unicode_ci; let collation=utf8mb3_unicode_ci;

3
mysql-test/main/ctype_utf8mb4.test
View File

@ -1,3 +1,6 @@
# Enable after fix MDEV-27904
-- source include/no_view_protocol.inc
--source include/have_utf8mb4.inc --source include/have_utf8mb4.inc
# #

3
mysql-test/main/ctype_utf8mb4_innodb.test
View File

@ -1,3 +1,6 @@
# Enable after fix MDEV-27904
-- source include/no_view_protocol.inc
--source include/have_utf8mb4.inc --source include/have_utf8mb4.inc
--source include/have_innodb.inc --source include/have_innodb.inc

3
mysql-test/main/custom_aggregate_functions.test
View File

@ -1,3 +1,6 @@
# Check tests after fix MDEV-28475
-- source include/no_view_protocol.inc
create table t2 (sal int(10)); create table t2 (sal int(10));
delimiter |; delimiter |;

3
mysql-test/main/custom_aggregates_i_s.test
View File

@ -1,3 +1,6 @@
# enable view-protocol after fix MDEV-28475
-- source include/no_view_protocol.inc
--source include/default_optimizer_switch.inc --source include/default_optimizer_switch.inc
flush status; flush status;

3
mysql-test/main/date_formats.test
View File

@ -2,6 +2,9 @@
# Test of date format functions # Test of date format functions
# #
#remove this include after fix MDEV-27871
-- source include/no_view_protocol.inc
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
--enable_warnings --enable_warnings

2
mysql-test/main/ddl_i18n_koi8r.test
View File

@ -42,6 +42,7 @@ let collation=utf8mb3_unicode_ci;
--source include/have_collation.inc --source include/have_collation.inc
########################################################################### ###########################################################################
--disable_service_connection
set names koi8r; set names koi8r;
delimiter |; delimiter |;
@ -1119,3 +1120,4 @@ delimiter ;|
USE test; USE test;
DROP DATABASE mysqltest1; DROP DATABASE mysqltest1;
DROP DATABASE mysqltest2; DROP DATABASE mysqltest2;
--enable_service_connection

2
mysql-test/main/ddl_i18n_utf8.test
View File

@ -42,6 +42,7 @@ let collation=utf8mb3_unicode_ci;
--source include/have_collation.inc --source include/have_collation.inc
########################################################################### ###########################################################################
--disable_service_connection
set names utf8; set names utf8;
delimiter |; delimiter |;
@ -1122,3 +1123,4 @@ delimiter ;|
USE test; USE test;
DROP DATABASE mysqltest1; DROP DATABASE mysqltest1;
DROP DATABASE mysqltest2; DROP DATABASE mysqltest2;
--enable_service_connection

Some files were not shown because too many files have changed in this diff Show More