1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust the result diffs for innodb.instant_alter

Browse Source
This commit is contained in:
Marko Mäkelä 2017-11-27 11:19:26 +02:00
parent 447cd7b1af
commit 62fb022110
2 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mysql-test/suite/innodb/r/instant_alter,4k.rdiff
View File

@ -9,7 +9,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -191,7 +191,7 @@ @@ -250,7 +250,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -18,7 +18,7 @@
connection default; connection default;
BEGIN; BEGIN;
UPDATE t2 SET d1 = repeat(id, 200); UPDATE t2 SET d1 = repeat(id, 200);
@@ -202,7 +202,7 @@ @@ -261,7 +261,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -27,7 +27,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -212,7 +212,7 @@ @@ -271,7 +271,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -36,7 +36,7 @@
connection default; connection default;
ALTER TABLE t2 DROP p; ALTER TABLE t2 DROP p;
affected rows: 0 affected rows: 0
@@ -317,7 +317,7 @@ @@ -374,7 +374,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -45,7 +45,7 @@
connection default; connection default;
ALTER TABLE big ADD COLUMN ALTER TABLE big ADD COLUMN
(d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
@@ -340,7 +340,7 @@ @@ -397,7 +397,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -54,16 +54,16 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
CHECKSUM TABLE big; CHECKSUM TABLE big;
@@ -353,7 +353,7 @@ @@ -410,7 +410,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
-3 -3
+8 +8
connection default; connection default;
DROP TABLE big; InnoDB 0 transactions not purged
CREATE TABLE t1 DROP TABLE t1,t2,t3,big;
@@ -532,7 +532,7 @@ @@ -600,7 +600,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -72,7 +72,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -542,7 +542,7 @@ @@ -610,7 +610,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -81,7 +81,7 @@
connection default; connection default;
BEGIN; BEGIN;
UPDATE t2 SET d1 = repeat(id, 200); UPDATE t2 SET d1 = repeat(id, 200);
@@ -553,7 +553,7 @@ @@ -621,7 +621,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -90,7 +90,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -563,7 +563,7 @@ @@ -631,7 +631,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -99,7 +99,7 @@
connection default; connection default;
ALTER TABLE t2 DROP p; ALTER TABLE t2 DROP p;
affected rows: 0 affected rows: 0
@@ -668,7 +668,7 @@ @@ -734,7 +734,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -108,7 +108,7 @@
connection default; connection default;
ALTER TABLE big ADD COLUMN ALTER TABLE big ADD COLUMN
(d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
@@ -691,7 +691,7 @@ @@ -757,7 +757,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -117,16 +117,16 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
CHECKSUM TABLE big; CHECKSUM TABLE big;
@@ -704,7 +704,7 @@ @@ -770,7 +770,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
-3 -3
+7 +7
connection default; connection default;
DROP TABLE big; InnoDB 0 transactions not purged
CREATE TABLE t1 DROP TABLE t1,t2,t3,big;
@@ -883,7 +883,7 @@ @@ -960,7 +960,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -135,7 +135,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -893,7 +893,7 @@ @@ -970,7 +970,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -144,7 +144,7 @@
connection default; connection default;
BEGIN; BEGIN;
UPDATE t2 SET d1 = repeat(id, 200); UPDATE t2 SET d1 = repeat(id, 200);
@@ -904,7 +904,7 @@ @@ -981,7 +981,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -153,7 +153,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -914,7 +914,7 @@ @@ -991,7 +991,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -162,7 +162,7 @@
connection default; connection default;
ALTER TABLE t2 DROP p; ALTER TABLE t2 DROP p;
affected rows: 0 affected rows: 0
@@ -1019,7 +1019,7 @@ @@ -1094,7 +1094,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -171,7 +171,7 @@
connection default; connection default;
ALTER TABLE big ADD COLUMN ALTER TABLE big ADD COLUMN
(d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
@@ -1042,7 +1042,7 @@ @@ -1117,7 +1117,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -180,12 +180,12 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
CHECKSUM TABLE big; CHECKSUM TABLE big;
@@ -1055,7 +1055,7 @@ @@ -1130,7 +1130,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
-3 -3
+7 +7
connection default; connection default;
DROP TABLE big; InnoDB 0 transactions not purged
disconnect analyze; DROP TABLE t1,t2,t3,big;

54
mysql-test/suite/innodb/r/instant_alter,8k.rdiff
View File

@ -1,6 +1,6 @@
--- instant_alter.result --- instant_alter.result
+++ instant_alter,8k.result +++ instant_alter,8k.result
@@ -181,7 +181,7 @@ @@ -240,7 +240,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -9,7 +9,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -191,7 +191,7 @@ @@ -250,7 +250,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -18,7 +18,7 @@
connection default; connection default;
BEGIN; BEGIN;
UPDATE t2 SET d1 = repeat(id, 200); UPDATE t2 SET d1 = repeat(id, 200);
@@ -202,7 +202,7 @@ @@ -261,7 +261,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -27,7 +27,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -212,7 +212,7 @@ @@ -271,7 +271,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -36,7 +36,7 @@
connection default; connection default;
ALTER TABLE t2 DROP p; ALTER TABLE t2 DROP p;
affected rows: 0 affected rows: 0
@@ -317,7 +317,7 @@ @@ -374,7 +374,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -45,7 +45,7 @@
connection default; connection default;
ALTER TABLE big ADD COLUMN ALTER TABLE big ADD COLUMN
(d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
@@ -340,7 +340,7 @@ @@ -397,7 +397,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -54,16 +54,16 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
CHECKSUM TABLE big; CHECKSUM TABLE big;
@@ -353,7 +353,7 @@ @@ -410,7 +410,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
-3 -3
+5 +5
connection default; connection default;
DROP TABLE big; InnoDB 0 transactions not purged
CREATE TABLE t1 DROP TABLE t1,t2,t3,big;
@@ -532,7 +532,7 @@ @@ -600,7 +600,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -72,7 +72,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -542,7 +542,7 @@ @@ -610,7 +610,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -81,7 +81,7 @@
connection default; connection default;
BEGIN; BEGIN;
UPDATE t2 SET d1 = repeat(id, 200); UPDATE t2 SET d1 = repeat(id, 200);
@@ -553,7 +553,7 @@ @@ -621,7 +621,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -90,7 +90,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -563,7 +563,7 @@ @@ -631,7 +631,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -99,7 +99,7 @@
connection default; connection default;
ALTER TABLE t2 DROP p; ALTER TABLE t2 DROP p;
affected rows: 0 affected rows: 0
@@ -668,7 +668,7 @@ @@ -734,7 +734,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -108,7 +108,7 @@
connection default; connection default;
ALTER TABLE big ADD COLUMN ALTER TABLE big ADD COLUMN
(d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
@@ -691,7 +691,7 @@ @@ -757,7 +757,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -117,16 +117,16 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
CHECKSUM TABLE big; CHECKSUM TABLE big;
@@ -704,7 +704,7 @@ @@ -770,7 +770,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
-3 -3
+5 +5
connection default; connection default;
DROP TABLE big; InnoDB 0 transactions not purged
CREATE TABLE t1 DROP TABLE t1,t2,t3,big;
@@ -883,7 +883,7 @@ @@ -960,7 +960,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -135,7 +135,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -893,7 +893,7 @@ @@ -970,7 +970,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -144,7 +144,7 @@
connection default; connection default;
BEGIN; BEGIN;
UPDATE t2 SET d1 = repeat(id, 200); UPDATE t2 SET d1 = repeat(id, 200);
@@ -904,7 +904,7 @@ @@ -981,7 +981,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -153,7 +153,7 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
connection analyze; connection analyze;
@@ -914,7 +914,7 @@ @@ -991,7 +991,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t2'; WHERE name = 'test/t2';
clust_index_size clust_index_size
@ -162,7 +162,7 @@
connection default; connection default;
ALTER TABLE t2 DROP p; ALTER TABLE t2 DROP p;
affected rows: 0 affected rows: 0
@@ -1019,7 +1019,7 @@ @@ -1094,7 +1094,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -171,7 +171,7 @@
connection default; connection default;
ALTER TABLE big ADD COLUMN ALTER TABLE big ADD COLUMN
(d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
@@ -1042,7 +1042,7 @@ @@ -1117,7 +1117,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
@ -180,12 +180,12 @@
connection default; connection default;
ROLLBACK; ROLLBACK;
CHECKSUM TABLE big; CHECKSUM TABLE big;
@@ -1055,7 +1055,7 @@ @@ -1130,7 +1130,7 @@
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/big'; WHERE name = 'test/big';
clust_index_size clust_index_size
-3 -3
+5 +5
connection default; connection default;
DROP TABLE big; InnoDB 0 transactions not purged
disconnect analyze; DROP TABLE t1,t2,t3,big;