database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch 'merge/merge-xtradb-5.5' into bb-5.5-serg

Browse Source 
update tests
This commit is contained in:
Sergei Golubchik
2015-06-05 02:14:49 +02:00
parent f84f577aa1 750aa8b09d
commit ae0c576d46
10 changed files with 10 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/innodb/t/foreign-keys.test
View File

@ -1,11 +1,6 @@
--source include/have_innodb.inc
--source include/have_debug.inc
if (`select plugin_auth_version <= "5.5.39-MariaDB-36.0" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB as of 5.5.39-MariaDB-36.0 or earlier
}
--echo #
--echo # Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
--echo # ADD FOREIGN KEY

5
mysql-test/suite/innodb/t/innodb-autoinc.test
View File

@ -1,8 +1,3 @@
if (`select plugin_auth_version <= "5.5.37-MariaDB-34.0" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB as of 5.5.37-MariaDB-34.0 or earlier
}
--source include/have_innodb.inc
# embedded server ignores 'delayed', so skip this
-- source include/not_embedded.inc

5
mysql-test/suite/innodb/t/insert_debug.test
View File

@ -2,11 +2,6 @@
--source include/have_debug.inc
--source include/have_partition.inc
if (`select plugin_auth_version <= "5.5.40-MariaDB-36.1" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB as of 5.5.40-MariaDB-36.1 or earlier
}
--echo #
--echo # Bug#19904003 INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG=1
--echo # CAUSES INFINITE PAGE SPLIT

5
mysql-test/suite/innodb/t/sp_temp_table.test
View File

@ -1,11 +1,6 @@
--source include/have_innodb.inc
--source include/big_test.inc
if (`select plugin_auth_version <= "5.5.40-MariaDB-36.1" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB as of 5.5.40-MariaDB-36.1 or earlier
}
--echo #
--echo # Bug #19306524 FAILING ASSERTION WITH TEMP TABLE FOR A PROCEDURE
--echo # CALLED FROM A FUNCTION

5
mysql-test/suite/innodb/t/strict_mode.test
View File

@ -1,10 +1,5 @@
--source include/have_innodb.inc
if (`select plugin_auth_version <= "5.5.40-MariaDB-36.1" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB as of 5.5.40-MariaDB-36.1 or earlier
}
--echo #
--echo # Bug #17852083 PRINT A WARNING WHEN DDL HAS AN ERROR IN
--echo # INNODB_STRICT_MODE = 1

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

@ -1,3 +1,7 @@
if (`select plugin_auth_version <= "5.5.43-MariaDB-37.2" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB as of 5.5.43-MariaDB-37.2 or earlier
}
--source include/have_innodb.inc
# Embedded server does not support restarting.
--source include/not_embedded.inc

5
mysql-test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test
View File

@ -2,11 +2,6 @@
# This is a debug variable for now
-- source include/have_debug.inc
if (`select plugin_auth_version <= "5.5.31-MariaDB-30.2" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB 5.5.31-MariaDB-30.2 or earlier
}
SELECT @@global.innodb_buffer_pool_evict;
SET GLOBAL innodb_buffer_pool_evict = 'uncompressed';

5
mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
View File

@ -1,8 +1,3 @@
if (`select plugin_auth_version <= "5.5.37-MariaDB-34.0" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB as of 5.5.37-MariaDB-34.0 or earlier
}
#
# 2010-01-27 - Added
#

4
mysql-test/t/partition_innodb.test
View File

@ -1,3 +1,7 @@
if (`select plugin_auth_version <= "5.5.43-MariaDB-37.2" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB as of 5.5.43-MariaDB-37.2 or earlier
}
--source include/not_embedded.inc
--source include/have_partition.inc
--source include/have_innodb.inc

4
storage/xtradb/include/univ.i
View File

@ -64,10 +64,10 @@ component, i.e. we show M.N.P as M.N */
(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
#ifndef PERCONA_INNODB_VERSION
#define PERCONA_INNODB_VERSION 37.1
#define PERCONA_INNODB_VERSION 37.2
#endif
#define INNODB_VERSION_STR "5.5.42-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION)
#define INNODB_VERSION_STR "5.5.43-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION)
#define REFMAN "http://dev.mysql.com/doc/refman/" \
IB_TO_STR(MYSQL_MAJOR_VERSION) "." \