1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Post merge review fixes

* Remove duplicate lines from tests
* Use thd instead of current_thd
* Remove extra wsrep_binlog_format_names
* Correctly merge union patch from 5.5 wrt duplicate rows.
* Correctly merge SELinux changes into 10.1
This commit is contained in:
Vicențiu Ciorbaru
2017-01-17 02:35:16 +02:00
parent d807e41511
commit 1e192e901c
13 changed files with 23 additions and 239 deletions

View File

@ -1,7 +1,6 @@
include/master-slave.inc
[connection master]
---Setup Section --
---Setup Section --
set timestamp=1000000000;
CREATE TABLE t1(word VARCHAR(20));
CREATE TABLE t2(id INT AUTO_INCREMENT NOT NULL PRIMARY KEY);