mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merged mysql-5.5->mysql-5.5-security
This commit is contained in:
Georgi Kodinov
@ -885,31 +885,31 @@ create table t1(a blob,b blob,c blob,d blob,e blob,f blob,g blob,h blob,
|
||||
i blob,j blob,k blob,l blob,m blob,n blob,o blob,p blob,
|
||||
q blob,r blob,s blob,t blob,u blob)
|
||||
engine=innodb row_format=dynamic;
|
||||
create index t1a on t1 (a(1));
|
||||
create index t1b on t1 (b(1));
|
||||
create index t1c on t1 (c(1));
|
||||
create index t1d on t1 (d(1));
|
||||
create index t1e on t1 (e(1));
|
||||
create index t1f on t1 (f(1));
|
||||
create index t1g on t1 (g(1));
|
||||
create index t1h on t1 (h(1));
|
||||
create index t1i on t1 (i(1));
|
||||
create index t1j on t1 (j(1));
|
||||
create index t1k on t1 (k(1));
|
||||
create index t1l on t1 (l(1));
|
||||
create index t1m on t1 (m(1));
|
||||
create index t1n on t1 (n(1));
|
||||
create index t1o on t1 (o(1));
|
||||
create index t1p on t1 (p(1));
|
||||
create index t1q on t1 (q(1));
|
||||
create index t1r on t1 (r(1));
|
||||
create index t1s on t1 (s(1));
|
||||
create index t1t on t1 (t(1));
|
||||
create index t1u on t1 (u(1));
|
||||
create index t1a on t1 (a(767));
|
||||
create index t1b on t1 (b(767));
|
||||
create index t1c on t1 (c(767));
|
||||
create index t1d on t1 (d(767));
|
||||
create index t1e on t1 (e(767));
|
||||
create index t1f on t1 (f(767));
|
||||
create index t1g on t1 (g(767));
|
||||
create index t1h on t1 (h(767));
|
||||
create index t1i on t1 (i(767));
|
||||
create index t1j on t1 (j(767));
|
||||
create index t1k on t1 (k(767));
|
||||
create index t1l on t1 (l(767));
|
||||
create index t1m on t1 (m(767));
|
||||
create index t1n on t1 (n(767));
|
||||
create index t1o on t1 (o(767));
|
||||
create index t1p on t1 (p(767));
|
||||
create index t1q on t1 (q(767));
|
||||
create index t1r on t1 (r(767));
|
||||
create index t1s on t1 (s(767));
|
||||
create index t1t on t1 (t(767));
|
||||
create index t1u on t1 (u(767));
|
||||
ERROR HY000: Too big row
|
||||
create index t1ut on t1 (u(1), t(1));
|
||||
create index t1ut on t1 (u(767), t(767));
|
||||
ERROR HY000: Too big row
|
||||
create index t1st on t1 (s(1), t(1));
|
||||
create index t1st on t1 (s(767), t(767));
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
@ -934,32 +934,32 @@ t1 CREATE TABLE `t1` (
|
||||
`s` blob,
|
||||
`t` blob,
|
||||
`u` blob,
|
||||
KEY `t1a` (`a`(1)),
|
||||
KEY `t1b` (`b`(1)),
|
||||
KEY `t1c` (`c`(1)),
|
||||
KEY `t1d` (`d`(1)),
|
||||
KEY `t1e` (`e`(1)),
|
||||
KEY `t1f` (`f`(1)),
|
||||
KEY `t1g` (`g`(1)),
|
||||
KEY `t1h` (`h`(1)),
|
||||
KEY `t1i` (`i`(1)),
|
||||
KEY `t1j` (`j`(1)),
|
||||
KEY `t1k` (`k`(1)),
|
||||
KEY `t1l` (`l`(1)),
|
||||
KEY `t1m` (`m`(1)),
|
||||
KEY `t1n` (`n`(1)),
|
||||
KEY `t1o` (`o`(1)),
|
||||
KEY `t1p` (`p`(1)),
|
||||
KEY `t1q` (`q`(1)),
|
||||
KEY `t1r` (`r`(1)),
|
||||
KEY `t1s` (`s`(1)),
|
||||
KEY `t1t` (`t`(1)),
|
||||
KEY `t1st` (`s`(1),`t`(1))
|
||||
KEY `t1a` (`a`(767)),
|
||||
KEY `t1b` (`b`(767)),
|
||||
KEY `t1c` (`c`(767)),
|
||||
KEY `t1d` (`d`(767)),
|
||||
KEY `t1e` (`e`(767)),
|
||||
KEY `t1f` (`f`(767)),
|
||||
KEY `t1g` (`g`(767)),
|
||||
KEY `t1h` (`h`(767)),
|
||||
KEY `t1i` (`i`(767)),
|
||||
KEY `t1j` (`j`(767)),
|
||||
KEY `t1k` (`k`(767)),
|
||||
KEY `t1l` (`l`(767)),
|
||||
KEY `t1m` (`m`(767)),
|
||||
KEY `t1n` (`n`(767)),
|
||||
KEY `t1o` (`o`(767)),
|
||||
KEY `t1p` (`p`(767)),
|
||||
KEY `t1q` (`q`(767)),
|
||||
KEY `t1r` (`r`(767)),
|
||||
KEY `t1s` (`s`(767)),
|
||||
KEY `t1t` (`t`(767)),
|
||||
KEY `t1st` (`s`(767),`t`(767))
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
|
||||
create index t1u on t1 (u(1));
|
||||
create index t1u on t1 (u(767));
|
||||
ERROR HY000: Too big row
|
||||
alter table t1 row_format=compact;
|
||||
create index t1u on t1 (u(1));
|
||||
create index t1u on t1 (u(767));
|
||||
drop table t1;
|
||||
set global innodb_file_per_table=0;
|
||||
set global innodb_file_format=Antelope;
|
||||
|
||||
185
mysql-test/suite/innodb/r/innodb_index_large_prefix.result
Normal file
185
mysql-test/suite/innodb/r/innodb_index_large_prefix.result
Normal file
@ -0,0 +1,185 @@
|
||||
set global innodb_file_format="Barracuda";
|
||||
set global innodb_file_per_table=1;
|
||||
set global innodb_large_prefix=1;
|
||||
create table worklog5743(a TEXT not null, primary key (a(1000)))
|
||||
ROW_FORMAT=DYNAMIC, engine = innodb;
|
||||
insert into worklog5743 values(repeat("a", 20000));
|
||||
update worklog5743 set a = (repeat("b", 16000));
|
||||
create index idx on worklog5743(a(2000));
|
||||
begin;
|
||||
update worklog5743 set a = (repeat("x", 17000));
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
REPEATABLE-READ
|
||||
select a = repeat("x", 17000) from worklog5743;
|
||||
a = repeat("x", 17000)
|
||||
0
|
||||
select a = repeat("b", 16000) from worklog5743;
|
||||
a = repeat("b", 16000)
|
||||
1
|
||||
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
READ-UNCOMMITTED
|
||||
select a = repeat("x", 17000) from worklog5743;
|
||||
a = repeat("x", 17000)
|
||||
1
|
||||
rollback;
|
||||
drop table worklog5743;
|
||||
create table worklog5743(a1 int, a2 TEXT not null)
|
||||
ROW_FORMAT=DYNAMIC, engine = innodb;
|
||||
create index idx on worklog5743(a1, a2(2000));
|
||||
insert into worklog5743 values(9, repeat("a", 10000));
|
||||
begin;
|
||||
update worklog5743 set a1 = 1000;
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
REPEATABLE-READ
|
||||
explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE worklog5743 ref idx idx 5 const 1 Using where
|
||||
select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
|
||||
a1 a2 = repeat("a", 10000)
|
||||
9 1
|
||||
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
READ-UNCOMMITTED
|
||||
select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
|
||||
a1 a2 = repeat("a", 10000)
|
||||
rollback;
|
||||
drop table worklog5743;
|
||||
create table worklog5743(a1 int, a2 TEXT not null)
|
||||
ROW_FORMAT=DYNAMIC, engine = innodb;
|
||||
create index idx on worklog5743(a1, a2(50));
|
||||
insert into worklog5743 values(9, repeat("a", 10000));
|
||||
begin;
|
||||
update worklog5743 set a1 = 1000;
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
REPEATABLE-READ
|
||||
explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE worklog5743 ref idx idx 5 const 1 Using where
|
||||
select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
|
||||
a1 a2 = repeat("a", 10000)
|
||||
9 1
|
||||
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
READ-UNCOMMITTED
|
||||
select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
|
||||
a1 a2 = repeat("a", 10000)
|
||||
rollback;
|
||||
drop table worklog5743;
|
||||
create table worklog5743_2(a1 int, a2 TEXT not null)
|
||||
ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
|
||||
create table worklog5743_4(a1 int, a2 TEXT not null)
|
||||
ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
|
||||
create index idx1 on worklog5743_2(a1, a2(942));
|
||||
ERROR HY000: Too big row
|
||||
create index idx1 on worklog5743_2(a1, a2(940));
|
||||
create index idx1 on worklog5743_4(a1, a2(1966));
|
||||
ERROR HY000: Too big row
|
||||
create index idx1 on worklog5743_4(a1, a2(1964));
|
||||
insert into worklog5743_2 values(9, repeat("a", 10000));
|
||||
insert into worklog5743_4 values(9, repeat("a", 10000));
|
||||
begin;
|
||||
update worklog5743_2 set a1 = 1000;
|
||||
update worklog5743_4 set a1 = 1000;
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
REPEATABLE-READ
|
||||
explain select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE worklog5743_2 ref idx1 idx1 5 const 1 Using where
|
||||
select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
|
||||
a1 a2 = repeat("a", 10000)
|
||||
9 1
|
||||
select a1, a2 = repeat("a", 10000) from worklog5743_4 where a1 = 9;
|
||||
a1 a2 = repeat("a", 10000)
|
||||
9 1
|
||||
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
READ-UNCOMMITTED
|
||||
select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
|
||||
a1 a2 = repeat("a", 10000)
|
||||
select a1, a2 = repeat("a", 10000) from worklog5743_4 where a1 = 9;
|
||||
a1 a2 = repeat("a", 10000)
|
||||
rollback;
|
||||
drop table worklog5743_2;
|
||||
drop table worklog5743_4;
|
||||
create table worklog5743(a1 int, a2 varchar(3000))
|
||||
ROW_FORMAT=DYNAMIC, engine = innodb;
|
||||
create index idx on worklog5743(a1, a2);
|
||||
insert into worklog5743 values(9, repeat("a", 3000));
|
||||
begin;
|
||||
update worklog5743 set a1 = 1000;
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
REPEATABLE-READ
|
||||
explain select a1 from worklog5743 where a1 = 9;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE worklog5743 ref idx idx 5 const 1 Using where; Using index
|
||||
select a1 from worklog5743 where a1 = 9;
|
||||
a1
|
||||
9
|
||||
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
READ-UNCOMMITTED
|
||||
select a1 from worklog5743 where a1 = 9;
|
||||
a1
|
||||
rollback;
|
||||
drop table worklog5743;
|
||||
create table worklog5743(a TEXT not null, primary key (a(1000)))
|
||||
engine = innodb;
|
||||
ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
|
||||
create table worklog5743(a TEXT) engine = innodb;
|
||||
create index idx on worklog5743(a(1000));
|
||||
ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
|
||||
create index idx on worklog5743(a(725));
|
||||
insert into worklog5743 values(repeat("a", 20000));
|
||||
begin;
|
||||
insert into worklog5743 values(repeat("b", 20000));
|
||||
update worklog5743 set a = (repeat("x", 25000));
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
REPEATABLE-READ
|
||||
select a = repeat("a", 20000) from worklog5743;
|
||||
a = repeat("a", 20000)
|
||||
1
|
||||
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
|
||||
select @@session.tx_isolation;
|
||||
@@session.tx_isolation
|
||||
READ-UNCOMMITTED
|
||||
select a = repeat("x", 25000) from worklog5743;
|
||||
a = repeat("x", 25000)
|
||||
1
|
||||
1
|
||||
rollback;
|
||||
drop table worklog5743;
|
||||
create table worklog5743(a TEXT not null) ROW_FORMAT=DYNAMIC, engine = innodb;
|
||||
create index idx on worklog5743(a(3073));
|
||||
Warnings:
|
||||
Warning 1071 Specified key was too long; max key length is 3072 bytes
|
||||
Warning 1071 Specified key was too long; max key length is 3072 bytes
|
||||
create index idx2 on worklog5743(a(3072));
|
||||
show create table worklog5743;
|
||||
Table Create Table
|
||||
worklog5743 CREATE TABLE `worklog5743` (
|
||||
`a` text NOT NULL,
|
||||
KEY `idx` (`a`(3072)),
|
||||
KEY `idx2` (`a`(3072))
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
|
||||
drop table worklog5743;
|
||||
create table worklog5743(a TEXT not null) engine = innodb;
|
||||
create index idx on worklog5743(a(768));
|
||||
ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
|
||||
create index idx2 on worklog5743(a(767));
|
||||
drop table worklog5743;
|
||||
SET GLOBAL innodb_file_format=Antelope;
|
||||
SET GLOBAL innodb_file_per_table=0;
|
||||
SET GLOBAL innodb_file_format_max=Antelope;
|
||||
SET GLOBAL innodb_large_prefix=0;
|
||||
@ -2663,7 +2663,6 @@ COUNT(*)
|
||||
1537
|
||||
SET SESSION sort_buffer_size = DEFAULT;
|
||||
DROP TABLE t1;
|
||||
End of 5.1 tests
|
||||
#
|
||||
# Test for bug #39932 "create table fails if column for FK is in different
|
||||
# case than in corr index".
|
||||
@ -2685,6 +2684,23 @@ t2 CREATE TABLE `t2` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
||||
drop table t2, t1;
|
||||
#
|
||||
# Test for bug #11762012 - "54553: INNODB ASSERTS IN HA_INNOBASE::
|
||||
# UPDATE_ROW, TEMPORARY TABLE, TABLE LOCK".
|
||||
#
|
||||
DROP TABLE IF EXISTS t1;
|
||||
CREATE TEMPORARY TABLE t1 (c int) ENGINE = InnoDB;
|
||||
INSERT INTO t1 VALUES (1);
|
||||
LOCK TABLES t1 READ;
|
||||
# Even though temporary table was locked for READ we
|
||||
# still allow writes to it to be compatible with MyISAM.
|
||||
# This is possible since due to fact that temporary tables
|
||||
# are specific to connection and therefore locking for them
|
||||
# is irrelevant.
|
||||
UPDATE t1 SET c = 5;
|
||||
UNLOCK TABLES;
|
||||
DROP TEMPORARY TABLE t1;
|
||||
End of 5.1 tests
|
||||
#
|
||||
# Bug#44613 SELECT statement inside FUNCTION takes a shared lock
|
||||
#
|
||||
DROP TABLE IF EXISTS t1;
|
||||
|
||||
1354
mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
Normal file
1354
mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,91 @@
|
||||
set global innodb_file_format="Barracuda";
|
||||
set global innodb_file_per_table=1;
|
||||
set global innodb_large_prefix=1;
|
||||
DROP TABLE IF EXISTS worklog5743;
|
||||
CREATE TABLE worklog5743 (
|
||||
col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
|
||||
PRIMARY KEY (col_1_text(3072))
|
||||
) ROW_FORMAT=DYNAMIC, engine = innodb;
|
||||
INSERT INTO worklog5743 VALUES(REPEAT("a", 3500) , REPEAT("o", 3500));
|
||||
SELECT col_1_text = REPEAT("a", 3500) , col_2_text = REPEAT("o", 3500) FROM
|
||||
worklog5743;
|
||||
col_1_text = REPEAT("a", 3500) col_2_text = REPEAT("o", 3500)
|
||||
1 1
|
||||
"In connection 1"
|
||||
SELECT col_1_text = REPEAT("a", 3500) , col_2_text = REPEAT("o", 3500) FROM
|
||||
worklog5743;
|
||||
col_1_text = REPEAT("a", 3500) col_2_text = REPEAT("o", 3500)
|
||||
1 1
|
||||
SELECT COUNT(*) FROM worklog5743;
|
||||
COUNT(*)
|
||||
1
|
||||
"In connection 2"
|
||||
START TRANSACTION;
|
||||
INSERT INTO worklog5743 VALUES(REPEAT("b", 3500) , REPEAT("o", 3500));
|
||||
"In connection 1"
|
||||
SELECT col_1_text = REPEAT("a", 3500) , col_2_text = REPEAT("o", 3500) FROM
|
||||
worklog5743;
|
||||
col_1_text = REPEAT("a", 3500) col_2_text = REPEAT("o", 3500)
|
||||
1 1
|
||||
SELECT COUNT(*) FROM worklog5743;
|
||||
COUNT(*)
|
||||
1
|
||||
START TRANSACTION;
|
||||
"In connection default ....restarting the server"
|
||||
SELECT COUNT(*) FROM worklog5743;
|
||||
COUNT(*)
|
||||
1
|
||||
SELECT col_1_text = REPEAT("a", 3500) , col_2_text = REPEAT("o", 3500) FROM
|
||||
worklog5743;
|
||||
col_1_text = REPEAT("a", 3500) col_2_text = REPEAT("o", 3500)
|
||||
1 1
|
||||
"In connection 1"
|
||||
SELECT col_1_text = REPEAT("a", 3500) , col_2_text = REPEAT("o", 3500) FROM
|
||||
worklog5743;
|
||||
col_1_text = REPEAT("a", 3500) col_2_text = REPEAT("o", 3500)
|
||||
1 1
|
||||
SELECT COUNT(*) FROM worklog5743;
|
||||
COUNT(*)
|
||||
1
|
||||
START TRANSACTION;
|
||||
INSERT INTO worklog5743 VALUES(REPEAT("b", 3500) , REPEAT("o", 3500));
|
||||
DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 3500);
|
||||
SELECT col_1_text = REPEAT("a", 3500) , col_2_text = REPEAT("o", 3500) FROM
|
||||
worklog5743;
|
||||
col_1_text = REPEAT("a", 3500) col_2_text = REPEAT("o", 3500)
|
||||
1 1
|
||||
"In connection default ....restarting the server"
|
||||
SELECT COUNT(*) FROM worklog5743;
|
||||
COUNT(*)
|
||||
1
|
||||
SELECT col_1_text = REPEAT("a", 3500) , col_2_text = REPEAT("o", 3500) FROM
|
||||
worklog5743;
|
||||
col_1_text = REPEAT("a", 3500) col_2_text = REPEAT("o", 3500)
|
||||
1 1
|
||||
"In connection 1"
|
||||
SELECT col_1_text = REPEAT("a", 3500) , col_2_text = REPEAT("o", 3500) FROM
|
||||
worklog5743;
|
||||
col_1_text = REPEAT("a", 3500) col_2_text = REPEAT("o", 3500)
|
||||
1 1
|
||||
SELECT COUNT(*) FROM worklog5743;
|
||||
COUNT(*)
|
||||
1
|
||||
START TRANSACTION;
|
||||
UPDATE worklog5743 SET col_1_text = REPEAT("b", 3500) WHERE col_1_text = REPEAT("a", 3500);
|
||||
SELECT col_1_text = REPEAT("b", 3500) , col_2_text = REPEAT("o", 3500) FROM
|
||||
worklog5743;
|
||||
col_1_text = REPEAT("b", 3500) col_2_text = REPEAT("o", 3500)
|
||||
1 1
|
||||
"In connection default ....restarting the server"
|
||||
SELECT COUNT(*) FROM worklog5743;
|
||||
COUNT(*)
|
||||
1
|
||||
SELECT col_1_text = REPEAT("a", 3500) , col_2_text = REPEAT("o", 3500) FROM
|
||||
worklog5743;
|
||||
col_1_text = REPEAT("a", 3500) col_2_text = REPEAT("o", 3500)
|
||||
1 1
|
||||
DROP TABLE worklog5743;
|
||||
SET GLOBAL innodb_file_format=Antelope;
|
||||
SET GLOBAL innodb_file_per_table=0;
|
||||
SET GLOBAL innodb_file_format_max=Antelope;
|
||||
SET GLOBAL innodb_large_prefix=0;
|
||||
Reference in New Issue
Block a user