Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
78965036
Commit
78965036
authored
5 years ago
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.3 into 10.4
parents
1d48c4a0
4dc10ec6
Changes
15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
129 additions
and
129 deletions
+129
-129
cmake/cpack_rpm.cmake
cmake/cpack_rpm.cmake
+1
-1
mysql-test/main/alter_table_errors.result
mysql-test/main/alter_table_errors.result
+1
-1
mysql-test/main/check_constraint_innodb.result
mysql-test/main/check_constraint_innodb.result
+1
-1
mysql-test/suite/innodb/r/innodb-alter-timestamp.result
mysql-test/suite/innodb/r/innodb-alter-timestamp.result
+1
-1
mysql-test/suite/innodb/r/innodb-alter.result
mysql-test/suite/innodb/r/innodb-alter.result
+2
-2
mysql-test/suite/innodb/r/innodb-wl5980-alter.result
mysql-test/suite/innodb/r/innodb-wl5980-alter.result
+1
-1
mysql-test/suite/innodb/r/instant_alter.result
mysql-test/suite/innodb/r/instant_alter.result
+3
-3
mysql-test/suite/innodb/r/instant_alter_charset,redundant.rdiff
...test/suite/innodb/r/instant_alter_charset,redundant.rdiff
+1
-1
mysql-test/suite/innodb/r/instant_alter_charset.result
mysql-test/suite/innodb/r/instant_alter_charset.result
+113
-113
mysql-test/suite/innodb/r/instant_alter_extend,utf8.rdiff
mysql-test/suite/innodb/r/instant_alter_extend,utf8.rdiff
+1
-1
mysql-test/suite/innodb/r/instant_alter_extend.result
mysql-test/suite/innodb/r/instant_alter_extend.result
+0
-0
mysql-test/suite/storage_engine/alter_table_online.result
mysql-test/suite/storage_engine/alter_table_online.result
+1
-1
sql/share/errmsg-utf8.txt
sql/share/errmsg-utf8.txt
+1
-1
storage/myisam/mysql-test/storage_engine/alter_table_online.rdiff
...myisam/mysql-test/storage_engine/alter_table_online.rdiff
+1
-1
storage/myisammrg/mysql-test/storage_engine/alter_table_online.rdiff
...sammrg/mysql-test/storage_engine/alter_table_online.rdiff
+1
-1
No files found.
cmake/cpack_rpm.cmake
View file @
78965036
...
...
@@ -277,7 +277,6 @@ IF(CMAKE_VERSION VERSION_GREATER "3.9.99")
SET
(
CPACK_SOURCE_GENERATOR
"RPM"
)
SETA
(
CPACK_RPM_SOURCE_PKG_BUILD_PARAMS
"-DBUILD_CONFIG=mysql_release"
"-DRPM=
${
RPM
}
"
"-DCPACK_RPM_BUILD_SOURCE_DIRS_PREFIX=/usr/src/debug/
${
CPACK_RPM_PACKAGE_NAME
}
-
${
VERSION
}
"
)
...
...
@@ -288,6 +287,7 @@ MACRO(ADDIF var)
ENDIF
()
ENDMACRO
()
ADDIF
(
CMAKE_BUILD_TYPE
)
ADDIF
(
BUILD_CONFIG
)
ADDIF
(
WITH_SSL
)
...
...
This diff is collapsed.
Click to expand it.
mysql-test/main/alter_table_errors.result
View file @
78965036
create table t (a int, v int as (a)) engine=innodb;
alter table t change column a b tinyint, algorithm=inplace;
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type
INPLACE
. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type. Try ALGORITHM=COPY
show create table t;
Table Create Table
t CREATE TABLE `t` (
...
...
This diff is collapsed.
Click to expand it.
mysql-test/main/check_constraint_innodb.result
View file @
78965036
...
...
@@ -2,7 +2,7 @@ create table t1 (a int, b smallint) engine=innodb;
connect con1,localhost,root,,test;
alter table t1 add constraint check (b < 8);
alter table t1 modify column b int, algorithm=inplace;
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type
INPLACE
. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type. Try ALGORITHM=COPY
connection default;
alter table t1 add primary key (a);
drop table t1;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/innodb/r/innodb-alter-timestamp.result
View file @
78965036
...
...
@@ -8,7 +8,7 @@ ALGORITHM=COPY;
ERROR 01000: Data truncated for column 'i1' at row 1
ALTER TABLE t1 CHANGE i1 id INT UNSIGNED NOT NULL AUTO_INCREMENT,
ADD PRIMARY KEY(id), ALGORITHM=INPLACE;
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type
INPLACE
. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type. Try ALGORITHM=COPY
ALTER IGNORE TABLE t1 ADD PRIMARY KEY(i1), ALGORITHM=INPLACE;
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Creating unique indexes with IGNORE requires COPY algorithm to remove duplicate rows. Try ALGORITHM=COPY
SET @old_sql_mode = @@sql_mode;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/innodb/r/innodb-alter.result
View file @
78965036
...
...
@@ -515,7 +515,7 @@ ERROR 42000: Incorrect column name 'FTS_DOC_ID'
ALTER TABLE t1o ADD FULLTEXT INDEX(ct),
CHANGE c1 FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
ALGORITHM=INPLACE;
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type
INPLACE
. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type. Try ALGORITHM=COPY
CREATE TABLE t1n LIKE t1o;
ALTER TABLE t1n ADD FULLTEXT INDEX(ct);
ALTER TABLE t1n CHANGE c1 Fts_DOC_ID INT, ALGORITHM=INPLACE;
...
...
@@ -588,7 +588,7 @@ t1n CREATE TABLE `t1n` (
DROP TABLE t1n;
ALTER TABLE t1o MODIFY c1 BIGINT UNSIGNED NOT NULL, DROP INDEX ct,
ALGORITHM=INPLACE;
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type
INPLACE
. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type. Try ALGORITHM=COPY
ALTER TABLE t1o MODIFY c1 BIGINT UNSIGNED NOT NULL, DROP INDEX ct;
ALTER TABLE t1o CHANGE c1 FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
ALGORITHM=INPLACE;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/innodb/r/innodb-wl5980-alter.result
View file @
78965036
...
...
@@ -781,7 +781,7 @@ ERROR 42000: Incorrect column name 'FTS_Doc_ID'
ALTER TABLE t1o ADD FULLTEXT INDEX(ct),
CHANGE c1 FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
ALGORITHM=INPLACE;
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type
INPLACE
. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type. Try ALGORITHM=COPY
CREATE TABLE t1n LIKE t1o;
ALTER TABLE t1n ADD FULLTEXT INDEX(ct);
### files in MYSQL_DATA_DIR/test
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/innodb/r/instant_alter.result
View file @
78965036
...
...
@@ -830,7 +830,7 @@ SELECT table_id INTO @table_id2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t1';
affected rows: 1
ALTER TABLE t1 CHANGE m i INT, ALGORITHM=INSTANT;
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: Cannot change column type
INPLACE
. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: Cannot change column type. Try ALGORITHM=COPY
ALTER TABLE t1 CHANGE m i INT;
affected rows: 1
info: Records: 1 Duplicates: 0 Warnings: 0
...
...
@@ -1654,7 +1654,7 @@ SELECT table_id INTO @table_id2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t1';
affected rows: 1
ALTER TABLE t1 CHANGE m i INT, ALGORITHM=INSTANT;
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: Cannot change column type
INPLACE
. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: Cannot change column type. Try ALGORITHM=COPY
ALTER TABLE t1 CHANGE m i INT;
affected rows: 1
info: Records: 1 Duplicates: 0 Warnings: 0
...
...
@@ -2478,7 +2478,7 @@ SELECT table_id INTO @table_id2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
WHERE name = 'test/t1';
affected rows: 1
ALTER TABLE t1 CHANGE m i INT, ALGORITHM=INSTANT;
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: Cannot change column type
INPLACE
. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: Cannot change column type. Try ALGORITHM=COPY
ALTER TABLE t1 CHANGE m i INT;
affected rows: 1
info: Records: 1 Duplicates: 0 Warnings: 0
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/innodb/r/instant_alter_charset,redundant.rdiff
View file @
78965036
...
...
@@ -4,7 +4,7 @@
alter table boundary_255
modify b varchar(200) charset utf8mb3,
algorithm=instant;
-ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: Cannot change column type
INPLACE
. Try ALGORITHM=COPY
-ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: Cannot change column type. Try ALGORITHM=COPY
alter table boundary_255
modify c varchar(300) charset utf8mb3,
algorithm=instant;
This diff is collapsed.
Click to expand it.
mysql-test/suite/innodb/r/instant_alter_charset.result
View file @
78965036
This diff is collapsed.
Click to expand it.
mysql-test/suite/innodb/r/instant_alter_extend,utf8.rdiff
View file @
78965036
...
...
@@ -17,7 +17,7 @@
+a 13 2100FE 660
# Convert from VARCHAR to a bigger CHAR
alter table t modify a varchar(200), algorithm=instant;
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: Cannot change column type
INPLACE
. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: Cannot change column type. Try ALGORITHM=COPY
@@ -72,7 +72,7 @@
test.t check status OK
call check_table('t');
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/innodb/r/instant_alter_extend.result
View file @
78965036
No preview for this file type
This diff is collapsed.
Click to expand it.
mysql-test/suite/storage_engine/alter_table_online.result
View file @
78965036
...
...
@@ -24,7 +24,7 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN>, c <CHAR_COLUMN>) ENGINE=<STORAG
INSERT INTO t1 (a,b,c) VALUES (1,100,'a'),(2,200,'b'),(3,300,'c');
ALTER ONLINE TABLE t1 DROP COLUMN b, ADD b <INT_COLUMN>;
ALTER ONLINE TABLE t1 MODIFY b BIGINT <CUSTOM_COL_OPTIONS>;
ERROR 0A000: LOCK=NONE is not supported. Reason: Cannot change column type
INPLACE
. Try LOCK=SHARED.
ERROR 0A000: LOCK=NONE is not supported. Reason: Cannot change column type. Try LOCK=SHARED.
ALTER ONLINE TABLE t1 ENGINE=MEMORY;
ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED.
DROP TABLE t1;
...
...
This diff is collapsed.
Click to expand it.
sql/share/errmsg-utf8.txt
View file @
78965036
...
...
@@ -7012,7 +7012,7 @@ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FK_RENAME
eng "Columns participating in a foreign key are renamed"
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_COLUMN_TYPE
eng "Cannot change column type
INPLACE
"
eng "Cannot change column type"
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FK_CHECK
eng "Adding foreign keys needs foreign_key_checks=OFF"
...
...
This diff is collapsed.
Click to expand it.
storage/myisam/mysql-test/storage_engine/alter_table_online.rdiff
View file @
78965036
...
...
@@ -14,7 +14,7 @@
+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# -------------------------------------------
ALTER ONLINE TABLE t1 MODIFY b BIGINT <CUSTOM_COL_OPTIONS>;
-ERROR 0A000: LOCK=NONE is not supported. Reason: Cannot change column type
INPLACE
. Try LOCK=SHARED.
-ERROR 0A000: LOCK=NONE is not supported. Reason: Cannot change column type. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED.
+# ERROR: Statement ended with errno 1845, errname ER_ALTER_OPERATION_NOT_SUPPORTED (expected results: ER_ALTER_OPERATION_NOT_SUPPORTED_REASON)
ALTER ONLINE TABLE t1 ENGINE=MEMORY;
...
...
This diff is collapsed.
Click to expand it.
storage/myisammrg/mysql-test/storage_engine/alter_table_online.rdiff
View file @
78965036
...
...
@@ -61,7 +61,7 @@
+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# -------------------------------------------
ALTER ONLINE TABLE t1 MODIFY b BIGINT <CUSTOM_COL_OPTIONS>;
-ERROR 0A000: LOCK=NONE is not supported. Reason: Cannot change column type
INPLACE
. Try LOCK=SHARED.
-ERROR 0A000: LOCK=NONE is not supported. Reason: Cannot change column type. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
+# ERROR: Statement ended with errno 1845, errname ER_ALTER_OPERATION_NOT_SUPPORTED (expected results: ER_ALTER_OPERATION_NOT_SUPPORTED_REASON)
ALTER ONLINE TABLE t1 ENGINE=MEMORY;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment