Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
ae0c576d
Commit
ae0c576d
authored
Jun 05, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'merge/merge-xtradb-5.5' into bb-5.5-serg
update tests
parents
f84f577a
750aa8b0
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
10 additions
and
37 deletions
+10
-37
mysql-test/suite/innodb/t/foreign-keys.test
mysql-test/suite/innodb/t/foreign-keys.test
+0
-5
mysql-test/suite/innodb/t/innodb-autoinc.test
mysql-test/suite/innodb/t/innodb-autoinc.test
+0
-5
mysql-test/suite/innodb/t/insert_debug.test
mysql-test/suite/innodb/t/insert_debug.test
+0
-5
mysql-test/suite/innodb/t/sp_temp_table.test
mysql-test/suite/innodb/t/sp_temp_table.test
+0
-5
mysql-test/suite/innodb/t/strict_mode.test
mysql-test/suite/innodb/t/strict_mode.test
+0
-5
mysql-test/suite/innodb/t/xa_recovery.test
mysql-test/suite/innodb/t/xa_recovery.test
+4
-0
mysql-test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test
...test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test
+0
-5
mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
...est/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
+0
-5
mysql-test/t/partition_innodb.test
mysql-test/t/partition_innodb.test
+4
-0
storage/xtradb/include/univ.i
storage/xtradb/include/univ.i
+2
-2
No files found.
mysql-test/suite/innodb/t/foreign-keys.test
View file @
ae0c576d
--
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
...
...
mysql-test/suite/innodb/t/innodb-autoinc.test
View file @
ae0c576d
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
...
...
mysql-test/suite/innodb/t/insert_debug.test
View file @
ae0c576d
...
...
@@ -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
...
...
mysql-test/suite/innodb/t/sp_temp_table.test
View file @
ae0c576d
--
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
...
...
mysql-test/suite/innodb/t/strict_mode.test
View file @
ae0c576d
--
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
...
...
mysql-test/suite/innodb/t/xa_recovery.test
View file @
ae0c576d
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
...
...
mysql-test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test
View file @
ae0c576d
...
...
@@ -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'
;
...
...
mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
View file @
ae0c576d
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
#
...
...
mysql-test/t/partition_innodb.test
View file @
ae0c576d
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
...
...
storage/xtradb/include/univ.i
View file @
ae0c576d
...
...
@@ -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.4
2
-MariaDB-"
IB_TO_STR
(
PERCONA_INNODB_VERSION
)
#
define
INNODB_VERSION_STR
"5.5.4
3
-MariaDB-"
IB_TO_STR
(
PERCONA_INNODB_VERSION
)
#
define
REFMAN
"http://dev.mysql.com/doc/refman/"
\
IB_TO_STR
(
MYSQL_MAJOR_VERSION
)
"."
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment