database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2015-12-21 21:24:22 +01:00
parent 1788bfe93a 4fdf25afa8
commit a2bcee626d
3462 changed files with 634342 additions and 220599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/My/ConfigFactory.pm
View File

@@ -274,6 +274,7 @@ if (IS_WINDOWS)
#
my @client_rules=
(
{ 'character-sets-dir' => \&fix_charset_dir },
);
@@ -296,7 +297,6 @@ my @mysqltest_rules=
#
my @mysqlbinlog_rules=
(
{ 'character-sets-dir' => \&fix_charset_dir },
);