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

mysql-5.5.37 selective merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-03-27 22:26:58 +01:00
parent 44002a34e6 faec0e2f4a
commit cb67dcb618
1335 changed files with 3710 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/suite/innodb/r/blob-update-debug.result Normal file
View File

@ -0,0 +1,15 @@
#
# Bug#18185930 UPD_NODE_INSERT_BLOB CAUSES BTR_EXTERN_OWNER_FLAG
# ASSERTION
#
create table t1 (f1 int primary key, f2 blob) engine = innodb;
insert into t1 values (1, repeat('*', 50000));
select f1, substring(f2, 1, 40) from t1;
f1 substring(f2, 1, 40)
1 ****************************************
set debug_dbug = 'd,row_ins_index_entry_timeout';
update t1 set f1 = 3;
select f1, substring(f2, 1, 40) from t1;
f1 substring(f2, 1, 40)
3 ****************************************
drop table t1;

9
mysql-test/suite/innodb/r/create-index.result Normal file
View File

@ -0,0 +1,9 @@
#
# Bug #18010711 UNIQUE PREFIX INDEX ON BINARY COLUMN: FAILING
# ASSERTION: FLEN == LEN
#
create table t1 (f1 binary(5)) engine=innodb;
insert into t1 values ('w'), ('w');
create unique index index_t1 on t1(f1(4));
ERROR 23000: Duplicate entry 'w' for key 'index_t1'
drop table t1;

27
mysql-test/suite/innodb/r/innodb-autoinc.result
View File

@ -1309,3 +1309,30 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`c1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
DROP TABLE t1;
#
# Bug #14049391 INNODB MISCALCULATES AUTO-INCREMENT
# AFTER CHANGING AUTO_INCREMENT_INCREMEMENT
#
CREATE TABLE t ( i INT AUTO_INCREMENT, KEY(i) ) ENGINE=InnoDB;
SET auto_increment_increment = 300;
INSERT INTO t VALUES (NULL), (NULL);
SHOW CREATE TABLE t;
Table Create Table
t CREATE TABLE `t` (
`i` int(11) NOT NULL AUTO_INCREMENT,
KEY `i` (`i`)
) ENGINE=InnoDB AUTO_INCREMENT=601 DEFAULT CHARSET=latin1
SET auto_increment_increment = 50;
INSERT INTO t VALUES (NULL);
SELECT * FROM t;
i
1
301
351
SHOW CREATE TABLE t;
Table Create Table
t CREATE TABLE `t` (
`i` int(11) NOT NULL AUTO_INCREMENT,
KEY `i` (`i`)
) ENGINE=InnoDB AUTO_INCREMENT=401 DEFAULT CHARSET=latin1
DROP TABLE t;

43
mysql-test/suite/innodb/r/innodb-update-insert.result Normal file
View File

@ -0,0 +1,43 @@
#
# Bug#14668683 ASSERT REC_GET_DELETED_FLAG(REC, PAGE_IS_COMP(PAGE))
#
create table t1(f1 char(1) primary key, f2 int not null, f3 blob)
engine=innodb;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`f1` char(1) NOT NULL,
`f2` int(11) NOT NULL,
`f3` blob,
PRIMARY KEY (`f1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
insert into t1 values ('a', 0, repeat('b',8102));
select f1 from t1;
f1
a
update t1 set f1='A';
select f1 from t1;
f1
A
drop table t1;
#
# Another test case
#
create table t1 (f1 char(1), f2 longblob, f3 blob, primary key(f1))
charset=utf8 engine=innodb;
replace into t1 set f1=0xa3;
Warnings:
Warning 1366 Incorrect string value: '\xA3' for column 'f1' at row 1
select f1 from t1;
f1
update t1 set f1=0x6a;
update t1 set f3=repeat(0xb1,8103);
update t1 set f1=0x4a;
update t1 set f1=0x82;
Warnings:
Warning 1366 Incorrect string value: '\x82' for column 'f1' at row 1
select f1 from t1;
f1
drop table t1;

17
mysql-test/suite/innodb/t/blob-update-debug.test Normal file
View File

@ -0,0 +1,17 @@
# This file contains tests involving update operations on blob data type.
--source include/have_innodb.inc
--source include/have_debug.inc
--echo #
--echo # Bug#18185930 UPD_NODE_INSERT_BLOB CAUSES BTR_EXTERN_OWNER_FLAG
--echo # ASSERTION
--echo #
create table t1 (f1 int primary key, f2 blob) engine = innodb;
insert into t1 values (1, repeat('*', 50000));
select f1, substring(f2, 1, 40) from t1;
set debug_dbug = 'd,row_ins_index_entry_timeout';
update t1 set f1 = 3;
select f1, substring(f2, 1, 40) from t1;
drop table t1;

11
mysql-test/suite/innodb/t/create-index.test Normal file
View File

@ -0,0 +1,11 @@
--source include/have_innodb.inc
--echo #
--echo # Bug #18010711 UNIQUE PREFIX INDEX ON BINARY COLUMN: FAILING
--echo # ASSERTION: FLEN == LEN
--echo #
create table t1 (f1 binary(5)) engine=innodb;
insert into t1 values ('w'), ('w');
--error ER_DUP_ENTRY
create unique index index_t1 on t1(f1(4));
drop table t1;

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

@ -1,3 +1,8 @@
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
@ -666,3 +671,16 @@ SELECT * FROM t1;
SHOW CREATE TABLE t1;
DROP TABLE t1;
--echo #
--echo # Bug #14049391 INNODB MISCALCULATES AUTO-INCREMENT
--echo # AFTER CHANGING AUTO_INCREMENT_INCREMEMENT
--echo #
CREATE TABLE t ( i INT AUTO_INCREMENT, KEY(i) ) ENGINE=InnoDB;
SET auto_increment_increment = 300;
INSERT INTO t VALUES (NULL), (NULL);
SHOW CREATE TABLE t;
SET auto_increment_increment = 50;
INSERT INTO t VALUES (NULL);
SELECT * FROM t;
SHOW CREATE TABLE t;
DROP TABLE t;

38
mysql-test/suite/innodb/t/innodb-update-insert.test Normal file
View File

@ -0,0 +1,38 @@
#
# Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
#
# This file contains test cases for checking the functionality "update by
# delete + insert".
--source include/have_innodb.inc
--echo #
--echo # Bug#14668683 ASSERT REC_GET_DELETED_FLAG(REC, PAGE_IS_COMP(PAGE))
--echo #
create table t1(f1 char(1) primary key, f2 int not null, f3 blob)
engine=innodb;
show create table t1;
insert into t1 values ('a', 0, repeat('b',8102));
select f1 from t1;
update t1 set f1='A';
select f1 from t1;
drop table t1;
--echo #
--echo # Another test case
--echo #
create table t1 (f1 char(1), f2 longblob, f3 blob, primary key(f1))
charset=utf8 engine=innodb;
replace into t1 set f1=0xa3;
select f1 from t1;
update t1 set f1=0x6a;
update t1 set f3=repeat(0xb1,8103);
update t1 set f1=0x4a;
update t1 set f1=0x82;
select f1 from t1;
drop table t1;