database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2021-09-09 12:15:55 +02:00
parent a6383a1954 c7184c470e
commit 46cb16388a
4 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/main/truncate.result
View File

@ -1,4 +1,3 @@
drop table if exists t1, t2;
create table t1 (a integer, b integer,c1 CHAR(10));
insert into t1 (a) values (1),(2);
truncate table t1;
@ -158,26 +157,6 @@ TRUNCATE t1;
HANDLER t1 READ FIRST;
ERROR 42S02: Unknown table 't1' in HANDLER
DROP TABLE t1;
# End of 6.0 tests
#
# 10.2 Test
# End of 5.5 tests
#
# MDEV-23365: Assertion `!is_set() || (m_status == DA_OK_BULK &&
# is_bulk_op())' failed upon killed TRUNCATE
#
CREATE TABLE t1 (a INT) ENGINE=MyISAM;
LOCK TABLE t1 READ;
connect con1,localhost,root,,test;
SET SESSION max_session_mem_used= 65536;
LOCK TABLE t1 WRITE;
connection default;
SELECT * FROM t1;
a
UNLOCK TABLES;
connection con1;
TRUNCATE TABLE t1;
ERROR HY000: The MariaDB server is running with the --max-thread-mem-used=65536 option so it cannot execute this statement
disconnect con1;
connection default;
DROP TABLE t1;
# End of 10.2 Test

33
mysql-test/main/truncate.test
View File

@ -1,9 +1,6 @@
#
# Test of truncate
#
--disable_warnings
drop table if exists t1, t2;
--enable_warnings
create table t1 (a integer, b integer,c1 CHAR(10));
insert into t1 (a) values (1),(2);
@ -161,34 +158,6 @@ HANDLER t1 READ FIRST;
# Cleanup
DROP TABLE t1;
--echo # End of 6.0 tests
--echo #
--echo # 10.2 Test
--echo # End of 5.5 tests
--echo #
--echo # MDEV-23365: Assertion `!is_set() || (m_status == DA_OK_BULK &&
--echo # is_bulk_op())' failed upon killed TRUNCATE
--echo #
CREATE TABLE t1 (a INT) ENGINE=MyISAM;
LOCK TABLE t1 READ;
--connect (con1,localhost,root,,test)
SET SESSION max_session_mem_used= 65536;
--send
LOCK TABLE t1 WRITE;
--connection default
SELECT * FROM t1;
UNLOCK TABLES;
--connection con1
--reap
--error ER_OPTION_PREVENTS_STATEMENT
TRUNCATE TABLE t1;
--disconnect con1
--connection default
DROP TABLE t1;
--echo # End of 10.2 Test

22
mysql-test/main/truncate_notembedded.result Normal file
View File

@ -0,0 +1,22 @@
#
# MDEV-23365: Assertion `!is_set() || (m_status == DA_OK_BULK &&
# is_bulk_op())' failed upon killed TRUNCATE
#
CREATE TABLE t1 (a INT) ENGINE=MyISAM;
LOCK TABLE t1 READ;
connect con1,localhost,root,,test;
SET SESSION max_session_mem_used= 65536;
LOCK TABLE t1 WRITE;
connection default;
SELECT * FROM t1;
a
UNLOCK TABLES;
connection con1;
TRUNCATE TABLE t1;
ERROR HY000: The MariaDB server is running with the --max-thread-mem-used=65536 option so it cannot execute this statement
disconnect con1;
connection default;
DROP TABLE t1;
#
# End of 10.2 tests
#

31
mysql-test/main/truncate_notembedded.test Normal file
View File

@ -0,0 +1,31 @@
--source include/not_embedded.inc
--echo #
--echo # MDEV-23365: Assertion `!is_set() || (m_status == DA_OK_BULK &&
--echo # is_bulk_op())' failed upon killed TRUNCATE
--echo #
CREATE TABLE t1 (a INT) ENGINE=MyISAM;
LOCK TABLE t1 READ;
--connect (con1,localhost,root,,test)
SET SESSION max_session_mem_used= 65536;
--send
LOCK TABLE t1 WRITE;
--connection default
SELECT * FROM t1;
UNLOCK TABLES;
--connection con1
--reap
--error ER_OPTION_PREVENTS_STATEMENT
TRUNCATE TABLE t1;
--disconnect con1
--connection default
DROP TABLE t1;
--echo #
--echo # End of 10.2 tests
--echo #