database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-27 05:41:41 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-05-04 17:04:55 +02:00
parent 4345868382 b85aa20065
commit 8cbb14ef5d
205 changed files with 2788 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog/r/binlog_mdev717.result
View File

@@ -21,6 +21,8 @@ ERROR 42000: Unknown database 'mysqltest'
connection default;
CREATE DATABASE mysqltest;
CREATE EVENT mysqltest.e1 ON SCHEDULE EVERY 15 MINUTE DO BEGIN END;
Warnings:
Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
SET DEBUG_SYNC= "after_wait_locked_schema_name SIGNAL locked WAIT_FOR release";
DROP DATABASE mysqltest;;
connection con1;

2
mysql-test/suite/binlog/r/binlog_sql_mode.result
View File

@@ -21,6 +21,8 @@ DO
BEGIN
UPDATE t1 SET id = id +1;
END;|
Warnings:
Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
Check Result
select
(@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog"))