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
773f1dad
Commit
773f1dad
authored
2 years ago
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.4 into 10.5
parents
ea847cbe
b922ae5f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
1 deletion
+31
-1
mysql-test/suite/innodb/r/instant_alter_upgrade.result
mysql-test/suite/innodb/r/instant_alter_upgrade.result
+9
-0
mysql-test/suite/innodb/t/instant_alter_upgrade.test
mysql-test/suite/innodb/t/instant_alter_upgrade.test
+16
-0
storage/innobase/buf/buf0buf.cc
storage/innobase/buf/buf0buf.cc
+4
-1
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/handler0alter.cc
+2
-0
No files found.
mysql-test/suite/innodb/r/instant_alter_upgrade.result
0 → 100644
View file @
773f1dad
#
# MDEV-26577 InnoDB: Failing assertion: dict_tf2_is_valid(flags, flags2)
# during ADD COLUMN
#
CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
CREATE TABLE t2(a INT PRIMARY KEY) ENGINE=InnoDB;
FLUSH TABLES;
ALTER TABLE t2 ADD COLUMN b INT;
DROP TABLE t1,t2;
This diff is collapsed.
Click to expand it.
mysql-test/suite/innodb/t/instant_alter_upgrade.test
0 → 100644
View file @
773f1dad
--
source
include
/
have_innodb
.
inc
--
source
include
/
innodb_row_format
.
inc
--
echo
#
--
echo
# MDEV-26577 InnoDB: Failing assertion: dict_tf2_is_valid(flags, flags2)
--
echo
# during ADD COLUMN
--
echo
#
CREATE
TABLE
t1
(
a
INT
PRIMARY
KEY
)
ENGINE
=
InnoDB
ROW_FORMAT
=
COMPRESSED
;
CREATE
TABLE
t2
(
a
INT
PRIMARY
KEY
)
ENGINE
=
InnoDB
;
FLUSH
TABLES
;
--
let
$datadir
=
`select @@datadir`
--
remove_file
$datadir
/
test
/
t2
.
frm
--
copy_file
$datadir
/
test
/
t1
.
frm
$datadir
/
test
/
t2
.
frm
ALTER
TABLE
t2
ADD
COLUMN
b
INT
;
DROP
TABLE
t1
,
t2
;
This diff is collapsed.
Click to expand it.
storage/innobase/buf/buf0buf.cc
View file @
773f1dad
...
...
@@ -980,10 +980,13 @@ buf_madvise_do_dump()
}
#endif
#ifndef UNIV_DEBUG
static
inline
byte
hex_to_ascii
(
byte
hex_digit
)
{
return
hex_digit
<=
9
?
'0'
+
hex_digit
:
(
'a'
-
10
)
+
hex_digit
;
const
int
offset
=
hex_digit
<=
9
?
'0'
:
'a'
-
10
;
return
byte
(
hex_digit
+
offset
);
}
#endif
/** Dump a page to stderr.
@param[in] read_buf database page
...
...
This diff is collapsed.
Click to expand it.
storage/innobase/handler/handler0alter.cc
View file @
773f1dad
...
...
@@ -6196,8 +6196,10 @@ prepare_inplace_alter_table_dict(
/* If we promised ALGORITHM=NOCOPY or ALGORITHM=INSTANT,
we must retain the original ROW_FORMAT of the table. */
flags
=
(
user_table
->
flags
&
(
DICT_TF_MASK_COMPACT
|
DICT_TF_MASK_ZIP_SSIZE
|
DICT_TF_MASK_ATOMIC_BLOBS
))
|
(
flags
&
~
(
DICT_TF_MASK_COMPACT
|
DICT_TF_MASK_ZIP_SSIZE
|
DICT_TF_MASK_ATOMIC_BLOBS
));
}
...
...
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