mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge branch '10.5' into 10.6
This commit is contained in:
@ -59,6 +59,7 @@ drop table t1;
|
||||
# Bug#16501: IS_USED_LOCK does not appear to work
|
||||
#
|
||||
|
||||
--disable_ps2_protocol
|
||||
CREATE TABLE t1 (conn CHAR(7), connection_id INT);
|
||||
INSERT INTO t1 VALUES ('default', CONNECTION_ID());
|
||||
|
||||
@ -90,6 +91,7 @@ disconnect con1;
|
||||
connection default;
|
||||
|
||||
DROP TABLE t1;
|
||||
--enable_ps2_protocol
|
||||
|
||||
#
|
||||
# Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets
|
||||
@ -153,15 +155,19 @@ select avg(a) from table_26093;
|
||||
select benchmark(100, (select avg(a) from table_26093));
|
||||
|
||||
set @invoked := 0;
|
||||
--disable_ps2_protocol
|
||||
select benchmark(100, (select avg(func_26093_a(a)) from table_26093));
|
||||
--enable_ps2_protocol
|
||||
# Returns only 10, since intermediate results are cached.
|
||||
select @invoked;
|
||||
|
||||
set @invoked := 0;
|
||||
--disable_ps2_protocol
|
||||
#enable after fix MDEV-27871
|
||||
--disable_view_protocol
|
||||
select benchmark(100, (select avg(func_26093_b(a, rand())) from table_26093));
|
||||
--enable_view_protocol
|
||||
--enable_ps2_protocol
|
||||
# Returns 1000, due to rand() preventing caching.
|
||||
select @invoked;
|
||||
|
||||
@ -636,6 +642,7 @@ DROP TABLE t1;
|
||||
--echo # GET_LOCK, RELEASE_LOCK, IS_USED_LOCK functions test
|
||||
--echo #
|
||||
|
||||
--disable_ps2_protocol
|
||||
--disable_service_connection
|
||||
|
||||
--echo # IS_USED_LOCK, IS_FREE_LOCK: the lock is not acquired
|
||||
@ -799,6 +806,7 @@ select is_free_lock(repeat('a', 193));
|
||||
select release_lock(repeat('a', 193));
|
||||
|
||||
--enable_service_connection
|
||||
--enable_ps2_protocol
|
||||
|
||||
--echo
|
||||
--echo # --
|
||||
@ -1229,8 +1237,10 @@ DROP TABLE t1;
|
||||
--echo # MDEV-20517 Assertion `!is_expensive()' failed in Item::value_depends_on_sql_mode_const_item
|
||||
--echo #
|
||||
|
||||
--disable_ps2_protocol
|
||||
SELECT ( 1 LIKE GET_LOCK( 'foo', 0 ) ) - 2;
|
||||
SELECT RELEASE_LOCK('foo');
|
||||
--enable_ps2_protocol
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.2 tests
|
||||
@ -1305,6 +1315,7 @@ DROP TABLE t1;
|
||||
--echo # MDEV-10569 Add RELEASE_ALL_LOCKS SQL-function
|
||||
--echo #
|
||||
--disable_view_protocol
|
||||
--disable_ps2_protocol
|
||||
|
||||
--echo # Test function without any locks
|
||||
SELECT RELEASE_ALL_LOCKS();
|
||||
@ -1359,4 +1370,5 @@ SELECT RELEASE_ALL_LOCKS();
|
||||
SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
|
||||
FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;
|
||||
|
||||
--enable_ps2_protocol
|
||||
--enable_view_protocol
|
||||
|
Reference in New Issue
Block a user