database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch 'merge-xtradb-5.6' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2016-02-16 18:55:00 +01:00
parent c8fcaf8aec d76eba6a6b
commit 17a792a441
18 changed files with 447 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/innodb/t/tmpdir.test
View File

@ -1,9 +1,9 @@
--source include/have_innodb.inc
--source include/count_sessions.inc
if (`select plugin_auth_version <= "5.6.26-MariaDB-76.0" from information_schema.plugins where plugin_name='innodb'`)
if (`select plugin_auth_version <= "5.6.28-MariaDB-76.1" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB as of 5.6.26-MariaDB-76.0 or earlier
--skip Not fixed in XtraDB as of 5.6.28-MariaDB-76.1 or earlier
}
--echo #