Skip to content

Commit f7708d6

Browse files
vuvovavuvova
committed
fixes for --embedded
1 parent d0d6284 commit f7708d6

9 files changed

+197
-42
lines changed

‎mysql-test/r/analyze_stmt_slow_query_log.result

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ a
88
2
99
drop table t1;
1010
# explain: id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
11-
# explain: 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used
12-
# explain: id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
1311
# explain: 1 INSERT t1 ALL NULL NULL NULL NULL NULL NULL 100.00 100.00 NULL
1412
# explain: id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
1513
# explain: 1 SIMPLE t1 ALL NULL NULL NULL NULL 10 10 100.00 30.00 Using where

‎mysql-test/r/set_statement.result

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,24 +1020,6 @@ t1 CREATE TABLE `t1` (
10201020
) ENGINE=MyISAM DEFAULT CHARSET=latin1
10211021
drop table t1;
10221022
SET @@default_storage_engine=@save_dfs;
1023-
SELECT @@MAX_STATEMENT_TIME;
1024-
@@MAX_STATEMENT_TIME
1025-
0.000000
1026-
SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(1);
1027-
SLEEP(1)
1028-
0
1029-
SHOW STATUS LIKE "max_statement_time_exceeded";
1030-
Variable_name Value
1031-
Max_statement_time_exceeded 0
1032-
SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(3);
1033-
SLEEP(3)
1034-
1
1035-
SHOW STATUS LIKE "max_statement_time_exceeded";
1036-
Variable_name Value
1037-
Max_statement_time_exceeded 1
1038-
SELECT @@MAX_STATEMENT_TIME;
1039-
@@MAX_STATEMENT_TIME
1040-
0.000000
10411023
SET STATEMENT keycache1.key_buffer_size=1024 FOR SELECT 1;
10421024
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL
10431025
set @save_general_log=@@global.general_log;
@@ -1064,10 +1046,6 @@ set statement rand_seed2=default for select 1;
10641046
ERROR 42000: The system variable rand_seed2 cannot be set in SET STATEMENT.
10651047
set statement skip_replication=default for select 1;
10661048
ERROR 42000: The system variable skip_replication cannot be set in SET STATEMENT.
1067-
set statement default_master_connection=default for select 1;
1068-
ERROR 42000: The system variable default_master_connection cannot be set in SET STATEMENT.
1069-
set statement default_master_connection=default for select 1;
1070-
ERROR 42000: The system variable default_master_connection cannot be set in SET STATEMENT.
10711049
set statement last_insert_id=1 for select 1;
10721050
ERROR 42000: The system variable last_insert_id cannot be set in SET STATEMENT.
10731051
set statement sql_log_off=default for select 1;

‎mysql-test/r/set_statement_notembedded.result

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
SELECT @@MAX_STATEMENT_TIME;
2+
@@MAX_STATEMENT_TIME
3+
0.000000
4+
SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(1);
5+
SLEEP(1)
6+
0
7+
SHOW STATUS LIKE "max_statement_time_exceeded";
8+
Variable_name Value
9+
Max_statement_time_exceeded 0
10+
SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(3);
11+
SLEEP(3)
12+
1
13+
SHOW STATUS LIKE "max_statement_time_exceeded";
14+
Variable_name Value
15+
Max_statement_time_exceeded 1
16+
SELECT @@MAX_STATEMENT_TIME;
17+
@@MAX_STATEMENT_TIME
18+
0.000000
19+
set statement default_master_connection=default for select 1;
20+
ERROR 42000: The system variable default_master_connection cannot be set in SET STATEMENT.
21+
set statement default_master_connection=default for select 1;
22+
ERROR 42000: The system variable default_master_connection cannot be set in SET STATEMENT.

‎mysql-test/suite/funcs_1/r/is_columns_is_embedded.result

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,19 @@ def information_schema FILES TRANSACTION_COUNTER 24 NULL YES bigint NULL NULL 19
152152
def information_schema FILES UPDATE_COUNT 13 NULL YES bigint NULL NULL 19 0 NULL NULL NULL bigint(4)
153153
def information_schema FILES UPDATE_TIME 34 NULL YES datetime NULL NULL NULL NULL 0 NULL NULL datetime
154154
def information_schema FILES VERSION 25 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned
155+
def information_schema GEOMETRY_COLUMNS COORD_DIMENSION 11 0 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(2)
156+
def information_schema GEOMETRY_COLUMNS F_GEOMETRY_COLUMN 4 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64)
157+
def information_schema GEOMETRY_COLUMNS F_TABLE_CATALOG 1 NO varchar 512 1536 NULL NULL NULL utf8 utf8_general_ci varchar(512)
158+
def information_schema GEOMETRY_COLUMNS F_TABLE_NAME 3 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64)
159+
def information_schema GEOMETRY_COLUMNS F_TABLE_SCHEMA 2 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64)
160+
def information_schema GEOMETRY_COLUMNS GEOMETRY_TYPE 10 0 NO int NULL NULL 10 0 NULL NULL NULL int(7)
161+
def information_schema GEOMETRY_COLUMNS G_GEOMETRY_COLUMN 8 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64)
162+
def information_schema GEOMETRY_COLUMNS G_TABLE_CATALOG 5 NO varchar 512 1536 NULL NULL NULL utf8 utf8_general_ci varchar(512)
163+
def information_schema GEOMETRY_COLUMNS G_TABLE_NAME 7 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64)
164+
def information_schema GEOMETRY_COLUMNS G_TABLE_SCHEMA 6 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64)
165+
def information_schema GEOMETRY_COLUMNS MAX_PPR 12 0 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(2)
166+
def information_schema GEOMETRY_COLUMNS SRID 13 0 NO smallint NULL NULL 5 0 NULL NULL NULL smallint(5)
167+
def information_schema GEOMETRY_COLUMNS STORAGE_TYPE 9 0 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(2)
155168
def information_schema GLOBAL_STATUS VARIABLE_NAME 1 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64)
156169
def information_schema GLOBAL_STATUS VARIABLE_VALUE 2 NO varchar 1024 3072 NULL NULL NULL utf8 utf8_general_ci varchar(1024)
157170
def information_schema GLOBAL_VARIABLES VARIABLE_NAME 1 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64)
@@ -309,6 +322,10 @@ def information_schema SESSION_STATUS VARIABLE_NAME 1 NO varchar 64 192 NULL NU
309322
def information_schema SESSION_STATUS VARIABLE_VALUE 2 NO varchar 1024 3072 NULL NULL NULL utf8 utf8_general_ci varchar(1024)
310323
def information_schema SESSION_VARIABLES VARIABLE_NAME 1 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64)
311324
def information_schema SESSION_VARIABLES VARIABLE_VALUE 2 NO varchar 1024 3072 NULL NULL NULL utf8 utf8_general_ci varchar(1024)
325+
def information_schema SPATIAL_REF_SYS AUTH_NAME 2 NO varchar 512 1536 NULL NULL NULL utf8 utf8_general_ci varchar(512)
326+
def information_schema SPATIAL_REF_SYS AUTH_SRID 3 0 NO smallint NULL NULL 5 0 NULL NULL NULL smallint(5)
327+
def information_schema SPATIAL_REF_SYS SRID 1 0 NO smallint NULL NULL 5 0 NULL NULL NULL smallint(5)
328+
def information_schema SPATIAL_REF_SYS SRTEXT 4 NO varchar 2048 6144 NULL NULL NULL utf8 utf8_general_ci varchar(2048)
312329
def information_schema STATISTICS CARDINALITY 10 NULL YES bigint NULL NULL 19 0 NULL NULL NULL bigint(21)
313330
def information_schema STATISTICS COLLATION 9 NULL YES varchar 1 3 NULL NULL NULL utf8 utf8_general_ci varchar(1)
314331
def information_schema STATISTICS COLUMN_NAME 8 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64)
@@ -490,6 +507,7 @@ NULL datetime NULL NULL
490507
NULL decimal NULL NULL
491508
NULL double NULL NULL
492509
NULL int NULL NULL
510+
NULL smallint NULL NULL
493511
NULL tinyint NULL NULL
494512
--> CHAR(0) is allowed (see manual), and here both CHARACHTER_* values
495513
--> are 0, which is intended behavior, and the result of 0 / 0 IS NULL
@@ -657,6 +675,19 @@ NULL information_schema FILES CHECK_TIME datetime NULL NULL NULL NULL datetime
657675
NULL information_schema FILES CHECKSUM bigint NULL NULL NULL NULL bigint(21) unsigned
658676
3.0000 information_schema FILES STATUS varchar 20 60 utf8 utf8_general_ci varchar(20)
659677
3.0000 information_schema FILES EXTRA varchar 255 765 utf8 utf8_general_ci varchar(255)
678+
3.0000 information_schema GEOMETRY_COLUMNS F_TABLE_CATALOG varchar 512 1536 utf8 utf8_general_ci varchar(512)
679+
3.0000 information_schema GEOMETRY_COLUMNS F_TABLE_SCHEMA varchar 64 192 utf8 utf8_general_ci varchar(64)
680+
3.0000 information_schema GEOMETRY_COLUMNS F_TABLE_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)
681+
3.0000 information_schema GEOMETRY_COLUMNS F_GEOMETRY_COLUMN varchar 64 192 utf8 utf8_general_ci varchar(64)
682+
3.0000 information_schema GEOMETRY_COLUMNS G_TABLE_CATALOG varchar 512 1536 utf8 utf8_general_ci varchar(512)
683+
3.0000 information_schema GEOMETRY_COLUMNS G_TABLE_SCHEMA varchar 64 192 utf8 utf8_general_ci varchar(64)
684+
3.0000 information_schema GEOMETRY_COLUMNS G_TABLE_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)
685+
3.0000 information_schema GEOMETRY_COLUMNS G_GEOMETRY_COLUMN varchar 64 192 utf8 utf8_general_ci varchar(64)
686+
NULL information_schema GEOMETRY_COLUMNS STORAGE_TYPE tinyint NULL NULL NULL NULL tinyint(2)
687+
NULL information_schema GEOMETRY_COLUMNS GEOMETRY_TYPE int NULL NULL NULL NULL int(7)
688+
NULL information_schema GEOMETRY_COLUMNS COORD_DIMENSION tinyint NULL NULL NULL NULL tinyint(2)
689+
NULL information_schema GEOMETRY_COLUMNS MAX_PPR tinyint NULL NULL NULL NULL tinyint(2)
690+
NULL information_schema GEOMETRY_COLUMNS SRID smallint NULL NULL NULL NULL smallint(5)
660691
3.0000 information_schema GLOBAL_STATUS VARIABLE_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)
661692
3.0000 information_schema GLOBAL_STATUS VARIABLE_VALUE varchar 1024 3072 utf8 utf8_general_ci varchar(1024)
662693
3.0000 information_schema GLOBAL_VARIABLES VARIABLE_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)
@@ -814,6 +845,10 @@ NULL information_schema ROUTINES LAST_ALTERED datetime NULL NULL NULL NULL datet
814845
3.0000 information_schema SESSION_STATUS VARIABLE_VALUE varchar 1024 3072 utf8 utf8_general_ci varchar(1024)
815846
3.0000 information_schema SESSION_VARIABLES VARIABLE_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)
816847
3.0000 information_schema SESSION_VARIABLES VARIABLE_VALUE varchar 1024 3072 utf8 utf8_general_ci varchar(1024)
848+
NULL information_schema SPATIAL_REF_SYS SRID smallint NULL NULL NULL NULL smallint(5)
849+
3.0000 information_schema SPATIAL_REF_SYS AUTH_NAME varchar 512 1536 utf8 utf8_general_ci varchar(512)
850+
NULL information_schema SPATIAL_REF_SYS AUTH_SRID smallint NULL NULL NULL NULL smallint(5)
851+
3.0000 information_schema SPATIAL_REF_SYS SRTEXT varchar 2048 6144 utf8 utf8_general_ci varchar(2048)
817852
3.0000 information_schema STATISTICS TABLE_CATALOG varchar 512 1536 utf8 utf8_general_ci varchar(512)
818853
3.0000 information_schema STATISTICS TABLE_SCHEMA varchar 64 192 utf8 utf8_general_ci varchar(64)
819854
3.0000 information_schema STATISTICS TABLE_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)

‎mysql-test/suite/funcs_1/r/is_tables_is_embedded.result

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,29 @@ user_comment
290290
Separator -----------------------------------------------------
291291
TABLE_CATALOG def
292292
TABLE_SCHEMA information_schema
293+
TABLE_NAME GEOMETRY_COLUMNS
294+
TABLE_TYPE SYSTEM VIEW
295+
ENGINE MEMORY
296+
VERSION 10
297+
ROW_FORMAT Fixed
298+
TABLE_ROWS #TBLR#
299+
AVG_ROW_LENGTH #ARL#
300+
DATA_LENGTH #DL#
301+
MAX_DATA_LENGTH #MDL#
302+
INDEX_LENGTH #IL#
303+
DATA_FREE #DF#
304+
AUTO_INCREMENT NULL
305+
CREATE_TIME #CRT#
306+
UPDATE_TIME #UT#
307+
CHECK_TIME #CT#
308+
TABLE_COLLATION utf8_general_ci
309+
CHECKSUM NULL
310+
CREATE_OPTIONS #CO#
311+
TABLE_COMMENT #TC#
312+
user_comment
313+
Separator -----------------------------------------------------
314+
TABLE_CATALOG def
315+
TABLE_SCHEMA information_schema
293316
TABLE_NAME GLOBAL_STATUS
294317
TABLE_TYPE SYSTEM VIEW
295318
ENGINE MEMORY
@@ -635,6 +658,29 @@ user_comment
635658
Separator -----------------------------------------------------
636659
TABLE_CATALOG def
637660
TABLE_SCHEMA information_schema
661+
TABLE_NAME SPATIAL_REF_SYS
662+
TABLE_TYPE SYSTEM VIEW
663+
ENGINE MEMORY
664+
VERSION 10
665+
ROW_FORMAT Fixed
666+
TABLE_ROWS #TBLR#
667+
AVG_ROW_LENGTH #ARL#
668+
DATA_LENGTH #DL#
669+
MAX_DATA_LENGTH #MDL#
670+
INDEX_LENGTH #IL#
671+
DATA_FREE #DF#
672+
AUTO_INCREMENT NULL
673+
CREATE_TIME #CRT#
674+
UPDATE_TIME #UT#
675+
CHECK_TIME #CT#
676+
TABLE_COLLATION utf8_general_ci
677+
CHECKSUM NULL
678+
CREATE_OPTIONS #CO#
679+
TABLE_COMMENT #TC#
680+
user_comment
681+
Separator -----------------------------------------------------
682+
TABLE_CATALOG def
683+
TABLE_SCHEMA information_schema
638684
TABLE_NAME STATISTICS
639685
TABLE_TYPE SYSTEM VIEW
640686
ENGINE MEMORY
@@ -1180,6 +1226,29 @@ user_comment
11801226
Separator -----------------------------------------------------
11811227
TABLE_CATALOG def
11821228
TABLE_SCHEMA information_schema
1229+
TABLE_NAME GEOMETRY_COLUMNS
1230+
TABLE_TYPE SYSTEM VIEW
1231+
ENGINE MEMORY
1232+
VERSION 10
1233+
ROW_FORMAT Fixed
1234+
TABLE_ROWS #TBLR#
1235+
AVG_ROW_LENGTH #ARL#
1236+
DATA_LENGTH #DL#
1237+
MAX_DATA_LENGTH #MDL#
1238+
INDEX_LENGTH #IL#
1239+
DATA_FREE #DF#
1240+
AUTO_INCREMENT NULL
1241+
CREATE_TIME #CRT#
1242+
UPDATE_TIME #UT#
1243+
CHECK_TIME #CT#
1244+
TABLE_COLLATION utf8_general_ci
1245+
CHECKSUM NULL
1246+
CREATE_OPTIONS #CO#
1247+
TABLE_COMMENT #TC#
1248+
user_comment
1249+
Separator -----------------------------------------------------
1250+
TABLE_CATALOG def
1251+
TABLE_SCHEMA information_schema
11831252
TABLE_NAME GLOBAL_STATUS
11841253
TABLE_TYPE SYSTEM VIEW
11851254
ENGINE MEMORY
@@ -1525,6 +1594,29 @@ user_comment
15251594
Separator -----------------------------------------------------
15261595
TABLE_CATALOG def
15271596
TABLE_SCHEMA information_schema
1597+
TABLE_NAME SPATIAL_REF_SYS
1598+
TABLE_TYPE SYSTEM VIEW
1599+
ENGINE MEMORY
1600+
VERSION 10
1601+
ROW_FORMAT Fixed
1602+
TABLE_ROWS #TBLR#
1603+
AVG_ROW_LENGTH #ARL#
1604+
DATA_LENGTH #DL#
1605+
MAX_DATA_LENGTH #MDL#
1606+
INDEX_LENGTH #IL#
1607+
DATA_FREE #DF#
1608+
AUTO_INCREMENT NULL
1609+
CREATE_TIME #CRT#
1610+
UPDATE_TIME #UT#
1611+
CHECK_TIME #CT#
1612+
TABLE_COLLATION utf8_general_ci
1613+
CHECKSUM NULL
1614+
CREATE_OPTIONS #CO#
1615+
TABLE_COMMENT #TC#
1616+
user_comment
1617+
Separator -----------------------------------------------------
1618+
TABLE_CATALOG def
1619+
TABLE_SCHEMA information_schema
15281620
TABLE_NAME STATISTICS
15291621
TABLE_TYPE SYSTEM VIEW
15301622
ENGINE MEMORY

‎mysql-test/suite/sys_vars/r/sysvars_server_embedded.result

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1337,6 +1337,20 @@ NUMERIC_BLOCK_SIZE NULL
13371337
ENUM_VALUE_LIST NULL
13381338
READ_ONLY NO
13391339
COMMAND_LINE_ARGUMENT REQUIRED
1340+
VARIABLE_NAME KEY_CACHE_FILE_HASH_SIZE
1341+
SESSION_VALUE NULL
1342+
GLOBAL_VALUE 512
1343+
GLOBAL_VALUE_ORIGIN COMPILE-TIME
1344+
DEFAULT_VALUE 512
1345+
VARIABLE_SCOPE GLOBAL
1346+
VARIABLE_TYPE BIGINT UNSIGNED
1347+
VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of MyISAM files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open MyISAM files.
1348+
NUMERIC_MIN_VALUE NULL
1349+
NUMERIC_MAX_VALUE NULL
1350+
NUMERIC_BLOCK_SIZE NULL
1351+
ENUM_VALUE_LIST NULL
1352+
READ_ONLY NO
1353+
COMMAND_LINE_ARGUMENT REQUIRED
13401354
VARIABLE_NAME KEY_CACHE_SEGMENTS
13411355
SESSION_VALUE NULL
13421356
GLOBAL_VALUE 0
@@ -2135,6 +2149,20 @@ NUMERIC_BLOCK_SIZE NULL
21352149
ENUM_VALUE_LIST NULL
21362150
READ_ONLY NO
21372151
COMMAND_LINE_ARGUMENT NONE
2152+
VARIABLE_NAME MYSQL56_TEMPORAL_FORMAT
2153+
SESSION_VALUE NULL
2154+
GLOBAL_VALUE ON
2155+
GLOBAL_VALUE_ORIGIN COMPILE-TIME
2156+
DEFAULT_VALUE ON
2157+
VARIABLE_SCOPE GLOBAL
2158+
VARIABLE_TYPE BOOLEAN
2159+
VARIABLE_COMMENT Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME, DATETIME, TIMESTAMP columns.
2160+
NUMERIC_MIN_VALUE NULL
2161+
NUMERIC_MAX_VALUE NULL
2162+
NUMERIC_BLOCK_SIZE NULL
2163+
ENUM_VALUE_LIST OFF,ON
2164+
READ_ONLY NO
2165+
COMMAND_LINE_ARGUMENT OPTIONAL
21382166
VARIABLE_NAME NET_BUFFER_LENGTH
21392167
SESSION_VALUE 16384
21402168
GLOBAL_VALUE 16384
@@ -3766,7 +3794,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
37663794
DEFAULT_VALUE OFF
37673795
VARIABLE_SCOPE GLOBAL
37683796
VARIABLE_TYPE BOOLEAN
3769-
VARIABLE_COMMENT Specify whether to time mutexes (only InnoDB mutexes are currently supported)
3797+
VARIABLE_COMMENT Specify whether to time mutexes. Deprecated, has no effect.
37703798
NUMERIC_MIN_VALUE NULL
37713799
NUMERIC_MAX_VALUE NULL
37723800
NUMERIC_BLOCK_SIZE NULL

‎mysql-test/t/analyze_stmt_slow_query_log.test

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ perl;
1515
my $slow_log_file= $ENV{'SLOW_LOG_FILE'} or die "SLOW_LOG_FILE not set";
1616
open(FILE, $slow_log_file) or die "Failed to open $slow_log_file";
1717
while(<FILE>) {
18-
if (/explain:/) {
19-
print $_;
20-
}
18+
next if 1../create table t1/; # skip entries generated by mtr prelude
19+
print if /explain:/;
2120
}
2221
close(FILE);
2322

‎mysql-test/t/set_statement.test

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -965,16 +965,6 @@ SHOW CREATE TABLE t1;
965965
drop table t1;
966966
SET @@default_storage_engine=@save_dfs;
967967

968-
#
969-
# statement timeout
970-
#
971-
SELECT @@MAX_STATEMENT_TIME;
972-
SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(1);
973-
SHOW STATUS LIKE "max_statement_time_exceeded";
974-
SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(3);
975-
SHOW STATUS LIKE "max_statement_time_exceeded";
976-
SELECT @@MAX_STATEMENT_TIME;
977-
978968
#
979969
# MDEV-6946:Assertion `0' failed in mysql_execute_command on SET STATEMENT
980970
# keycache1.key_buffer_size=.. FOR
@@ -1011,10 +1001,6 @@ set statement rand_seed2=default for select 1;
10111001
--error ER_SET_STATEMENT_NOT_SUPPORTED
10121002
set statement skip_replication=default for select 1;
10131003
--error ER_SET_STATEMENT_NOT_SUPPORTED
1014-
set statement default_master_connection=default for select 1;
1015-
--error ER_SET_STATEMENT_NOT_SUPPORTED
1016-
set statement default_master_connection=default for select 1;
1017-
--error ER_SET_STATEMENT_NOT_SUPPORTED
10181004
set statement last_insert_id=1 for select 1;
10191005
--error ER_SET_STATEMENT_NOT_SUPPORTED
10201006
set statement sql_log_off=default for select 1;

‎mysql-test/t/set_statement_notembedded.test

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
--source include/not_embedded.inc
2+
3+
#
4+
# statement timeout
5+
#
6+
SELECT @@MAX_STATEMENT_TIME;
7+
SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(1);
8+
SHOW STATUS LIKE "max_statement_time_exceeded";
9+
SET STATEMENT MAX_STATEMENT_TIME=2 FOR SELECT SLEEP(3);
10+
SHOW STATUS LIKE "max_statement_time_exceeded";
11+
SELECT @@MAX_STATEMENT_TIME;
12+
13+
--error ER_SET_STATEMENT_NOT_SUPPORTED
14+
set statement default_master_connection=default for select 1;
15+
--error ER_SET_STATEMENT_NOT_SUPPORTED
16+
set statement default_master_connection=default for select 1;
17+

0 commit comments

Comments
 (0)