Skip to content

Commit 512384a

Browse files
PS-9734 merge: Code refresh for 8.0.42-33 (conflicts resolved)
https://perconadev.atlassian.net/browse/PS-9734
1 parent 6dceae9 commit 512384a

File tree

21 files changed

+38
-156
lines changed

21 files changed

+38
-156
lines changed

MYSQL_VERSION

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
MYSQL_VERSION_MAJOR=8
22
MYSQL_VERSION_MINOR=0
3-
<<<<<<< HEAD
4-
MYSQL_VERSION_PATCH=41
5-
MYSQL_VERSION_EXTRA=-32
6-
||||||| 14ba93991ba
7-
MYSQL_VERSION_PATCH=41
8-
MYSQL_VERSION_EXTRA=
9-
=======
103
MYSQL_VERSION_PATCH=42
11-
MYSQL_VERSION_EXTRA=
12-
>>>>>>> mysql-8.0.42
4+
MYSQL_VERSION_EXTRA=-33
135
MYSQL_VERSION_STABILITY="LTS"

client/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ SET(MYSQLBINLOG_LIBRARIES
270270
binlogevents_static
271271
client_base
272272
perconaserverclient
273+
extra::unordered_dense
273274
)
274275

275276
IF(WITH_JSON_BINLOG_LIBRARY)

include/my_sys.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
<<<<<<< HEAD
2-
/* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
3-
Copyright (c) 2018, Percona and/or its affiliates.
4-
||||||| 14ba93991ba
5-
/* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
6-
=======
71
/* Copyright (c) 2000, 2025, Oracle and/or its affiliates.
8-
>>>>>>> mysql-8.0.42
2+
Copyright (c) 2018, Percona and/or its affiliates.
93
104
This program is free software; you can redistribute it and/or modify
115
it under the terms of the GNU General Public License, version 2.0,

man/mysqldumpslow.1

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
.\" Title: mysqldumpslow
33
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
44
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
5-
.\" Date: 03/13/2025
5+
.\" Date: 12/13/2024
66
.\" Manual: MySQL Database System
77
.\" Source: MySQL 8.0
88
.\" Language: English
99
.\"
10-
.TH "MYSQLDUMPSLOW" "1" "03/13/2025" "MySQL 8\&.0" "MySQL Database System"
10+
.TH "MYSQLDUMPSLOW" "1" "12/13/2024" "MySQL 8\&.0" "MySQL Database System"
1111
.\" -----------------------------------------------------------------
1212
.\" * Define some portability stuff
1313
.\" -----------------------------------------------------------------
@@ -42,15 +42,9 @@ from \fBPercona Toolkit\fR instead (https://www.percona.com/doc/percona-toolkit/
4242
.SH "COPYRIGHT"
4343
.br
4444
.PP
45-
<<<<<<< HEAD
4645
Copyright \(co 1997, 2023, Oracle and/or its affiliates.
4746
.br
4847
Copyright \(co 2016, Percona Inc.
49-
||||||| 14ba93991ba
50-
Copyright \(co 1997, 2024, Oracle and/or its affiliates.
51-
=======
52-
Copyright \(co 1997, 2025, Oracle and/or its affiliates.
53-
>>>>>>> mysql-8.0.42
5448
.PP
5549
This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
5650
.PP

plugin/binlog_utils_udf/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MYSQL_ADD_PLUGIN(binlog_utils_udf
22
binlog_utils_udf.cc
33
MODULE_ONLY MODULE_OUTPUT_NAME "binlog_utils_udf"
4-
LINK_LIBRARIES extra::rapidjson
4+
LINK_LIBRARIES extra::rapidjson extra::unordered_dense
55
)
66

77
set_target_properties(binlog_utils_udf PROPERTIES

plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,12 @@
5454
#include <openssl/engine.h>
5555
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
5656

57-
<<<<<<< HEAD
5857
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
5958
#include <openssl/evp.h>
6059
#include <openssl/provider.h>
6160
#endif
6261

63-
||||||| 14ba93991ba
64-
=======
6562
#include "xcom/retry.h"
66-
>>>>>>> mysql-8.0.42
6763
#include "xcom/task_debug.h"
6864
#include "xcom/x_platform.h"
6965

scripts/mysqldumpslow.pl.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
#!@PERL_PATH@
22

3-
<<<<<<< HEAD
43
# Copyright (c) 2000, 2024, Oracle and/or its affiliates.
54
# Copyright (c) 2016, Percona Inc.
6-
||||||| 14ba93991ba
7-
# Copyright (c) 2000, 2024, Oracle and/or its affiliates.
8-
=======
9-
# Copyright (c) 2000, 2025, Oracle and/or its affiliates.
10-
>>>>>>> mysql-8.0.42
115
#
126
# This program is free software; you can redistribute it and/or modify
137
# it under the terms of the GNU General Public License, version 2.0,

sql/rpl_trx_tracking.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,16 +164,8 @@ class Writeset_trx_dependency_tracker {
164164
Track the last transaction sequence number that changed each row
165165
in the database, using row hashes from the writeset as the index.
166166
*/
167-
<<<<<<< HEAD
168-
typedef std::map<uint64, int64> Writeset_history;
169-
std::shared_ptr<Writeset_history> m_writeset_history;
170-
||||||| 14ba93991ba
171-
typedef std::map<uint64, int64> Writeset_history;
172-
Writeset_history m_writeset_history;
173-
=======
174167
using Writeset_history = ankerl::unordered_dense::map<uint64, int64>;
175-
Writeset_history m_writeset_history;
176-
>>>>>>> mysql-8.0.42
168+
std::shared_ptr<Writeset_history> m_writeset_history;
177169
};
178170

179171
/**

sql/sql_table.cc

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8906,7 +8906,6 @@ static bool create_table_impl(
89068906
DBUG_PRINT("enter", ("db: '%s' table: '%s' tmp: %d", db, table_name,
89078907
internal_tmp_table));
89088908

8909-
<<<<<<< HEAD
89108909
// Check that we have at least one visible column.
89118910
bool has_visible_column = false;
89128911
for (const Create_field &create_field : alter_info->create_list) {
@@ -8920,25 +8919,8 @@ static bool create_table_impl(
89208919
return true;
89218920
}
89228921

8923-
if (check_engine(thd, db, table_name, create_info, alter_info)) return true;
8924-
||||||| 14ba93991ba
8925-
// Check that we have at least one visible column.
8926-
bool has_visible_column = false;
8927-
for (const Create_field &create_field : alter_info->create_list) {
8928-
if (create_field.hidden == dd::Column::enum_hidden_type::HT_VISIBLE) {
8929-
has_visible_column = true;
8930-
break;
8931-
}
8932-
}
8933-
if (!has_visible_column) {
8934-
my_error(ER_TABLE_MUST_HAVE_A_VISIBLE_COLUMN, MYF(0));
8922+
if (check_engine(thd, db, table_name, create_info, alter_info))
89358923
return true;
8936-
}
8937-
8938-
if (check_engine(db, table_name, create_info)) return true;
8939-
=======
8940-
if (check_engine(db, table_name, create_info)) return true;
8941-
>>>>>>> mysql-8.0.42
89428924

89438925
// Secondary engine cannot be defined for temporary tables.
89448926
if (create_info->secondary_engine.str != nullptr &&

storage/blackhole/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
MYSQL_ADD_PLUGIN(blackhole ha_blackhole.cc
2525
DEFAULT_LEGACY_ENGINE STORAGE_ENGINE
26-
LINK_LIBRARIES extra::rapidjson ext::zlib
26+
LINK_LIBRARIES extra::rapidjson ext::zlib extra::unordered_dense
2727
)
2828
# Exclude blackhole from PGO on Windows to avoid linker error LNK1248
2929
EXCLUDE_FROM_MSVC_PGO(blackhole)

0 commit comments

Comments
 (0)