Skip to content

Commit ebefef6

Browse files
dr-mdr-m
committed
Merge 10.11 into 11.2
2 parents 4a1ded6 + eca552a commit ebefef6

File tree

71 files changed

+992
-681
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+992
-681
lines changed

‎client/mysqldump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4270,7 +4270,7 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
42704270

42714271
if (versioned && !opt_xml && opt_dump_history)
42724272
{
4273-
fprintf(md_result_file,"/*!101100 SET @old_system_versioning_insert_history=@@session.system_versioning_insert_history, @@session.system_versioning_insert_history=1 */;\n");
4273+
fprintf(md_result_file,"/*M!101100 SET @old_system_versioning_insert_history=@@session.system_versioning_insert_history, @@session.system_versioning_insert_history=1 */;\n");
42744274
check_io(md_result_file);
42754275
}
42764276
if (opt_lock)
@@ -4572,7 +4572,7 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
45724572
}
45734573
if (versioned && !opt_xml && opt_dump_history)
45744574
{
4575-
fprintf(md_result_file,"/*!101100 SET system_versioning_insert_history=@old_system_versioning_insert_history */;\n");
4575+
fprintf(md_result_file,"/*M!101100 SET system_versioning_insert_history=@old_system_versioning_insert_history */;\n");
45764576
check_io(md_result_file);
45774577
}
45784578
mysql_free_result(res);

‎cmake/libfmt.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ MACRO(BUNDLE_LIBFMT)
1515
ExternalProject_Add(
1616
libfmt
1717
PREFIX "${dir}"
18-
URL "https://github.com/fmtlib/fmt/releases/download/11.0.1/fmt-11.0.1.zip"
19-
URL_MD5 5f3915e2eff60e7f70c558120592100d
18+
URL "https://github.com/fmtlib/fmt/releases/download/11.0.2/fmt-11.0.2.zip"
19+
URL_MD5 c622dca45ec3fc95254c48370a9f7a1d
2020
INSTALL_COMMAND ""
2121
CONFIGURE_COMMAND ""
2222
BUILD_COMMAND ""

‎extra/innochecksum.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ static bool is_page_corrupted(byte *buf, bool is_encrypted, uint32_t flags)
519519
normal method. */
520520
if (is_encrypted && key_version != 0) {
521521
is_corrupted = use_full_crc32
522-
? buf_page_is_corrupted(true, buf, flags)
522+
? !!buf_page_is_corrupted(false, buf, flags)
523523
: !fil_space_verify_crypt_checksum(buf, zip_size);
524524

525525
if (is_corrupted && log_file) {

‎extra/mariabackup/fil_cur.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ static bool page_is_corrupted(const byte *page, ulint page_no,
283283
}
284284

285285
if (space->full_crc32()) {
286-
return buf_page_is_corrupted(true, page, space->flags);
286+
return buf_page_is_corrupted(false, page, space->flags);
287287
}
288288

289289
/* Validate encrypted pages. The first page is never encrypted.
@@ -316,7 +316,7 @@ static bool page_is_corrupted(const byte *page, ulint page_no,
316316
}
317317

318318
if (page_type != FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED) {
319-
return buf_page_is_corrupted(true, tmp_page,
319+
return buf_page_is_corrupted(false, tmp_page,
320320
space->flags);
321321
}
322322
}
@@ -336,11 +336,11 @@ static bool page_is_corrupted(const byte *page, ulint page_no,
336336
&& cursor->zip_size)
337337
|| page_type == FIL_PAGE_PAGE_COMPRESSED
338338
|| page_type == FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED
339-
|| buf_page_is_corrupted(true, tmp_page,
339+
|| buf_page_is_corrupted(false, tmp_page,
340340
space->flags));
341341
}
342342

343-
return buf_page_is_corrupted(true, page, space->flags);
343+
return buf_page_is_corrupted(false, page, space->flags);
344344
}
345345
PRAGMA_REENABLE_CHECK_STACK_FRAME
346346

‎extra/mariabackup/xtrabackup.cc

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3426,7 +3426,8 @@ static bool xtrabackup_copy_mmap_logfile()
34263426
recv_sys_t::parse_mtr_result r;
34273427
const byte *start= &log_sys.buf[recv_sys.offset];
34283428

3429-
if (recv_sys.parse_mmap<false>(false) == recv_sys_t::OK)
3429+
if (recv_sys.parse_mmap<recv_sys_t::store::BACKUP>(false) ==
3430+
recv_sys_t::OK)
34303431
{
34313432
const byte *end;
34323433

@@ -3446,7 +3447,8 @@ static bool xtrabackup_copy_mmap_logfile()
34463447
start = seq + 1;
34473448
}
34483449
}
3449-
while ((r= recv_sys.parse_mmap<false>(false)) == recv_sys_t::OK);
3450+
while ((r= recv_sys.parse_mmap<recv_sys_t::store::BACKUP>(false)) ==
3451+
recv_sys_t::OK);
34503452

34513453
end= &log_sys.buf[recv_sys.offset];
34523454

@@ -3551,7 +3553,8 @@ static bool xtrabackup_copy_logfile()
35513553
if (log_sys.buf[recv_sys.offset] <= 1)
35523554
break;
35533555

3554-
if (recv_sys.parse_mtr<false>(false) == recv_sys_t::OK)
3556+
if (recv_sys.parse_mtr<recv_sys_t::store::BACKUP>(false) ==
3557+
recv_sys_t::OK)
35553558
{
35563559
do
35573560
{
@@ -3561,7 +3564,8 @@ static bool xtrabackup_copy_logfile()
35613564
sequence_offset));
35623565
*seq= 1;
35633566
}
3564-
while ((r= recv_sys.parse_mtr<false>(false)) == recv_sys_t::OK);
3567+
while ((r= recv_sys.parse_mtr<recv_sys_t::store::BACKUP>(false)) ==
3568+
recv_sys_t::OK);
35653569

35663570
if (ds_write(dst_log_file, log_sys.buf + start_offset,
35673571
recv_sys.offset - start_offset))
@@ -3929,7 +3933,7 @@ static void xb_load_single_table_tablespace(const char *dirname,
39293933

39303934
for (int i = 0; i < 10; i++) {
39313935
file->m_defer = false;
3932-
err = file->validate_first_page();
3936+
err = file->validate_first_page(file->get_first_page());
39333937

39343938
if (file->m_defer) {
39353939
if (defer_space_id) {
@@ -3971,7 +3975,7 @@ static void xb_load_single_table_tablespace(const char *dirname,
39713975
skip_node_page0 ? file->detach() : pfs_os_file_t(),
39723976
0, false, false);
39733977
node->deferred= defer;
3974-
if (!space->read_page0())
3978+
if (!space->read_page0(nullptr, true))
39753979
err = DB_CANNOT_OPEN_FILE;
39763980
mysql_mutex_unlock(&fil_system.mutex);
39773981

@@ -6863,8 +6867,10 @@ static bool xtrabackup_prepare_func(char** argv)
68636867
goto error;
68646868
}
68656869

6866-
ok = fil_system.sys_space->open(false)
6867-
&& xtrabackup_apply_deltas();
6870+
mysql_mutex_lock(&recv_sys.mutex);
6871+
ok = fil_system.sys_space->open(false);
6872+
mysql_mutex_unlock(&recv_sys.mutex);
6873+
if (ok) ok = xtrabackup_apply_deltas();
68686874

68696875
xb_data_files_close();
68706876

‎mysql-test/main/ctype_utf32.result

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3025,6 +3025,15 @@ HEX(DATE_FORMAT(TIME'11:22:33',@format))
30253025
# End of 10.4 tests
30263026
#
30273027
#
3028+
# MDEV-31221 UBSAN runtime error: negation of -9223372036854775808 cannot be represented in type 'long long int' in my_strtoll10_utf32
3029+
#
3030+
SELECT CAST(CONVERT('-9223372036854775808' USING utf32) AS SIGNED) AS c1;
3031+
c1
3032+
-9223372036854775808
3033+
#
3034+
# End of 10.5 tests
3035+
#
3036+
#
30283037
# Start of 10.11 tests
30293038
#
30303039
#
@@ -3109,12 +3118,3 @@ SET NAMES utf8mb4;
31093118
#
31103119
# End of 10.11 tests
31113120
#
3112-
#
3113-
# MDEV-31221 UBSAN runtime error: negation of -9223372036854775808 cannot be represented in type 'long long int' in my_strtoll10_utf32
3114-
#
3115-
SELECT CAST(CONVERT('-9223372036854775808' USING utf32) AS SIGNED) AS c1;
3116-
c1
3117-
-9223372036854775808
3118-
#
3119-
# End of 10.5 tests
3120-
#

‎mysql-test/main/ctype_utf32.test

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,6 +1161,16 @@ SELECT HEX(DATE_FORMAT(TIME'11:22:33',@format));
11611161
--echo # End of 10.4 tests
11621162
--echo #
11631163

1164+
--echo #
1165+
--echo # MDEV-31221 UBSAN runtime error: negation of -9223372036854775808 cannot be represented in type 'long long int' in my_strtoll10_utf32
1166+
--echo #
1167+
1168+
SELECT CAST(CONVERT('-9223372036854775808' USING utf32) AS SIGNED) AS c1;
1169+
1170+
--echo #
1171+
--echo # End of 10.5 tests
1172+
--echo #
1173+
11641174
--echo #
11651175
--echo # Start of 10.11 tests
11661176
--echo #
@@ -1238,14 +1248,3 @@ SET NAMES utf8mb4;
12381248
--echo #
12391249

12401250
--enable_service_connection
1241-
1242-
1243-
--echo #
1244-
--echo # MDEV-31221 UBSAN runtime error: negation of -9223372036854775808 cannot be represented in type 'long long int' in my_strtoll10_utf32
1245-
--echo #
1246-
1247-
SELECT CAST(CONVERT('-9223372036854775808' USING utf32) AS SIGNED) AS c1;
1248-
1249-
--echo #
1250-
--echo # End of 10.5 tests
1251-
--echo #

‎mysql-test/main/delete.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,9 @@ drop table t1,t2,t3;
633633
--echo #
634634

635635
SET @sort_buffer_size_save= @@sort_buffer_size;
636+
--disable_warnings
636637
SET sort_buffer_size=1125899906842624;
638+
--enable_warnings
637639
CREATE TABLE t1 (a INT,b CHAR,KEY(a,b));
638640
DELETE a1 FROM t1 AS a1,t1 AS a2 WHERE a1.a=a2.a;
639641
DROP TABLE t1;

‎mysql-test/main/mysql57nopart.result

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#
2+
# MDEV-35079 Migrate MySQL5.7 to MariaDB 10.4, then to MariaDB 10.11 Failed
3+
#
4+
select table_name, concat('<',table_comment,'>') from information_schema.tables
5+
where table_schema='test';
6+
table_name concat('<',table_comment,'>')
7+
mysql57part <The MariaDB server is running with the --skip-partition option so it cannot execute this statement>
8+
Warnings:
9+
Warning 1290 The MariaDB server is running with the --skip-partition option so it cannot execute this statement
10+
drop table mysql57part;
11+
Warnings:
12+
Warning 1932 Table 'test.mysql57part' doesn't exist in engine
13+
# End of 10.11 tests

‎mysql-test/main/mysql57nopart.test

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
source include/have_innodb.inc;
2+
--echo #
3+
--echo # MDEV-35079 Migrate MySQL5.7 to MariaDB 10.4, then to MariaDB 10.11 Failed
4+
--echo #
5+
let $datadir=`select @@datadir`;
6+
copy_file std_data/mysql57part.frm $datadir/test/mysql57part.frm;
7+
select table_name, concat('<',table_comment,'>') from information_schema.tables
8+
where table_schema='test';
9+
drop table mysql57part;
10+
11+
--echo # End of 10.11 tests

0 commit comments

Comments
 (0)