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 10.0 into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä
2017-10-24 19:26:24 +03:00
parent 4330505629 44ed243522
commit db203d7471
18 changed files with 917 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/innodb_zip/t/innodb_prefix_index_liftedlimit.test
View File

@ -536,10 +536,11 @@ REPEAT("a", 4000) , REPEAT("a", 255)
CREATE INDEX prefix_idx3 ON worklog5743(col_3_text (3072));
CREATE INDEX prefix_idx4 ON worklog5743(col_4_blob (3072));
CREATE INDEX prefix_idx5 ON worklog5743(col_5_text (3072));
--error ER_UNDO_RECORD_TOO_BIG
BEGIN;
UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
WHERE col_1_varbinary = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
SHOW WARNINGS;
ROLLBACK;
DROP TABLE worklog5743;
#------------------------------------------------------------------------------
@ -585,13 +586,12 @@ REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
REPEAT("a", 4000) , REPEAT("a", 255)
);
ROLLBACK;
# Bug#12547647 - UPDATE LOGGING COULD EXCEED LOG PAGE SIZE
# Instead of this error, it would hang before this fix.
--error ER_UNDO_RECORD_TOO_BIG
BEGIN;
UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
WHERE col_1_varbinary = REPEAT("a", 4000)
AND col_2_varchar = REPEAT("o", 4000);
SHOW WARNINGS;
ROLLBACK;
SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
WHERE col_1_varbinary = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),