1
0
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:
Oleksandr Byelkin
2023-11-08 15:57:05 +01:00
381 changed files with 10233 additions and 5782 deletions

View File

@ -1,4 +1,3 @@
drop database if exists mysqltest1;
create schema foo;
show create schema foo;
Database Create Database
@ -16,26 +15,24 @@ drop schema foo;
#
# Bug #48940 MDL deadlocks against mysql_rm_db
#
DROP SCHEMA IF EXISTS schema1;
connect con2, localhost, root;
connection default;
CREATE SCHEMA schema1;
CREATE TABLE schema1.t1 (a INT);
SET autocommit= FALSE;
START TRANSACTION;
INSERT INTO schema1.t1 VALUES (1);
connection con2;
DROP SCHEMA schema1;
connection default;
ALTER SCHEMA schema1 DEFAULT CHARACTER SET utf8;
Got one of the listed errors
SET autocommit= TRUE;
COMMIT;
connection con2;
connection default;
disconnect con2;
#
# Bug #49988 MDL deadlocks with mysql_create_db, reload_acl_and_cache
#
DROP SCHEMA IF EXISTS schema1;
connect con2, localhost, root;
connection default;
CREATE SCHEMA schema1;
@ -78,8 +75,6 @@ disconnect con2;
# Tests for increased CREATE/ALTER/DROP DATABASE concurrency with
# database name locks.
#
DROP DATABASE IF EXISTS db1;
DROP DATABASE IF EXISTS db2;
connect con2, localhost, root;
connect con3, localhost, root;
connection default;