mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
Automerge from mysql-5.1
This commit is contained in:
commit
3cf30b89ba
1 changed files with 0 additions and 1 deletions
|
@ -2,7 +2,6 @@
|
|||
# in alphabetical order. This also helps with merge conflict resolution.
|
||||
|
||||
binlog.binlog_multi_engine # joro : NDB tests marked as experimental as agreed with bochklin
|
||||
binlog.binlog_bug23533 # skozlov: BUG#12371924
|
||||
|
||||
funcs_1.charset_collation_1 # depends on compile-time decisions
|
||||
|
||||
|
|
Loading…
Reference in a new issue