database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-05 20:33:10 +03:00
parent 474290540a 8648b9bed8
commit 2c3c851d2c
165 changed files with 4191 additions and 3448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
mysql-test/suite/innodb/r/alter_algorithm2.result Normal file
View File

@ -0,0 +1,81 @@
CREATE TABLE t1 (a INT)ENGINE=InnoDB;
INSERT INTO t1 VALUES(1);
SET alter_algorithm='INPLACE';
affected rows: 0
PREPARE stmt FROM 'ALTER TABLE t1 ADD KEY idx(a)';
affected rows: 0
info: Statement prepared
PREPARE stmt1 FROM 'ALTER TABLE t1 DROP KEY idx';
affected rows: 0
info: Statement prepared
CREATE OR REPLACE PROCEDURE p1()
BEGIN
ALTER TABLE t1 ADD KEY idx2(a);
END|
affected rows: 0
CREATE OR REPLACE PROCEDURE p2()
BEGIN
ALTER TABLE t1 DROP KEY idx2;
END|
affected rows: 0
SET alter_algorithm='COPY';
affected rows: 0
EXECUTE stmt;
affected rows: 1
info: Records: 1 Duplicates: 0 Warnings: 0
EXECUTE stmt1;
affected rows: 1
info: Records: 1 Duplicates: 0 Warnings: 0
call p1();
affected rows: 1
call p2();
affected rows: 1
SET alter_algorithm='NOCOPY';
affected rows: 0
EXECUTE stmt;
affected rows: 0
info: Records: 0 Duplicates: 0 Warnings: 0
EXECUTE stmt1;
affected rows: 0
info: Records: 0 Duplicates: 0 Warnings: 0
call p1();
affected rows: 0
call p2();
affected rows: 0
SET alter_algorithm='INSTANT';
affected rows: 0
EXECUTE stmt;
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: ADD INDEX. Try ALGORITHM=NOCOPY
call p1();
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: ADD INDEX. Try ALGORITHM=NOCOPY
DROP TABLE t1;
affected rows: 0
DROP PROCEDURE p1;
affected rows: 0
DROP PROCEDURE p2;
affected rows: 0
SET @save_allowed= @@GLOBAL.innodb_instant_alter_column_allowed;
affected rows: 0
SET GLOBAL innodb_instant_alter_column_allowed=never;
affected rows: 0
CREATE TABLE t1(id INT PRIMARY KEY,
col1 INT UNSIGNED NOT NULL UNIQUE)ENGINE=InnoDB;
affected rows: 0
INSERT INTO t1 VALUES(1,1),(2,2),(3,3);
affected rows: 3
info: Records: 3 Duplicates: 0 Warnings: 0
SET ALTER_ALGORITHM=INSTANT;
affected rows: 0
ALTER TABLE t1 DROP COLUMN col1;
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: innodb_instant_alter_column_allowed=never. Try ALGORITHM=INPLACE
ALTER TABLE t1 DROP COLUMN col1, ALGORITHM=NOCOPY;
ERROR 0A000: ALGORITHM=NOCOPY is not supported. Reason: innodb_instant_alter_column_allowed=never. Try ALGORITHM=INPLACE
ALTER TABLE t1 DROP COLUMN col1, ALGORITHM=DEFAULT;
affected rows: 0
info: Records: 0 Duplicates: 0 Warnings: 0
ALTER TABLE t1 DROP PRIMARY KEY, ALGORITHM=DEFAULT;
affected rows: 3
info: Records: 3 Duplicates: 0 Warnings: 0
DROP TABLE t1;
affected rows: 0
SET GLOBAL innodb_instant_alter_column_allowed=@save_allowed;