Skip to content

Commit 61fd625

Browse files
inikepinikep
committed
Implemented PS-8581 (Merge MySQL 8.0.32) (conflicts resolved)
https://jira.percona.com/browse/PS-8581 VERSION raised to "8.0.32-24". PERCONA_INNODB_VERSION in univ.i raised to "24". 1. Revert "Fixed PS-8303 - MySQL 8.0.29 - Assertion failure: dict0mem.h:2498:pos< n_def" at percona@81bd211595d in favor of upstream mysql/mysql-server@04f378f4f7d 2. Revert most of "PS-8546, Bug #108870: Eliminated dead code discovered with clang-15 compiler" at percona@b71d33d74bc in favor of upstream mysql/mysql-server@605df79542d 3. Revert upstream "Bug# 33630199 : mysqldump make a non-consistent backup with --single-transaction option" at mysql/mysql-server@022e73ba697 in favor of percona@6bb091b8094 Keep upstream's rpl_gtid.mysqldump_bug33630199 test. See also: https://bugs.mysql.com/bug.php?id=109685
1 parent 357b3e1 commit 61fd625

File tree

107 files changed

+531
-3306
lines changed

Some content is hidden

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

107 files changed

+531
-3306
lines changed

‎MYSQL_VERSION

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
MYSQL_VERSION_MAJOR=8
22
MYSQL_VERSION_MINOR=0
3-
<<<<<<< HEAD
4-
MYSQL_VERSION_PATCH=31
5-
MYSQL_VERSION_EXTRA=-23
6-
||||||| a246bad76b9
7-
MYSQL_VERSION_PATCH=31
8-
MYSQL_VERSION_EXTRA=
9-
=======
103
MYSQL_VERSION_PATCH=32
11-
MYSQL_VERSION_EXTRA=
12-
>>>>>>> mysql-8.0.32
4+
MYSQL_VERSION_EXTRA=-24

‎client/mysqldump.cc

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6456,19 +6456,6 @@ static bool process_set_gtid_purged(MYSQL *mysql_con, bool ftwrl_done) {
64566456
"--all-databases --triggers --routines --events. \n");
64576457
}
64586458

6459-
if (!opt_single_transaction && !opt_lock_all_tables && !opt_master_data) {
6460-
fprintf(stderr,
6461-
"Warning: A dump from a server that has GTIDs "
6462-
"enabled will by default include the GTIDs "
6463-
"of all transactions, even those that were "
6464-
"executed during its extraction and might "
6465-
"not be represented in the dumped data. "
6466-
"This might result in an inconsistent data dump. \n"
6467-
"In order to ensure a consistent backup of the "
6468-
"database, pass --single-transaction or "
6469-
"--lock-all-tables or --master-data. \n");
6470-
}
6471-
64726459
set_session_binlog(false);
64736460
if (add_set_gtid_purged(mysql_con, ftwrl_done)) {
64746461
mysql_free_result(gtid_mode_res);
@@ -6889,7 +6876,6 @@ int main(int argc, char **argv) {
68896876

68906877
if (opt_slave_data && do_stop_slave_sql(mysql)) goto err;
68916878

6892-
<<<<<<< HEAD
68936879
if (opt_single_transaction && opt_master_data) {
68946880
/*
68956881
See if we can avoid FLUSH TABLES WITH READ LOCK with Binlog_snapshot_*
@@ -6925,22 +6911,14 @@ int main(int argc, char **argv) {
69256911
if (do_flush_tables_read_lock(mysql)) goto err;
69266912
ftwrl_done = true;
69276913
} else if (opt_lock_for_backup && do_lock_tables_for_backup(mysql))
6928-
||||||| a246bad76b9
6929-
if ((opt_lock_all_tables || opt_master_data ||
6930-
(opt_single_transaction && flush_logs)) &&
6931-
do_flush_tables_read_lock(mysql))
6932-
=======
6933-
if ((opt_lock_all_tables || opt_master_data || opt_single_transaction) &&
6934-
do_flush_tables_read_lock(mysql))
6935-
>>>>>>> mysql-8.0.32
69366914
goto err;
69376915

69386916
/*
69396917
Flush logs before starting transaction since
69406918
this causes implicit commit starting mysql-5.5.
69416919
*/
6942-
if (opt_lock_all_tables || opt_master_data || opt_single_transaction ||
6943-
opt_delete_master_logs) {
6920+
if (opt_lock_all_tables || opt_master_data ||
6921+
(opt_single_transaction && flush_logs) || opt_delete_master_logs) {
69446922
if (flush_logs || opt_delete_master_logs) {
69456923
if (mysql_refresh(mysql, REFRESH_LOG)) {
69466924
DB_error(mysql, "when doing refresh");
@@ -6957,15 +6935,11 @@ int main(int argc, char **argv) {
69576935
if (get_bin_log_name(mysql, bin_log_name, sizeof(bin_log_name))) goto err;
69586936
}
69596937

6960-
<<<<<<< HEAD
69616938
if (has_session_variables_like(mysql, "rocksdb_skip_fill_cache"))
69626939
mysql_query_with_error_report(mysql, nullptr,
69636940
"SET SESSION rocksdb_skip_fill_cache=1");
69646941

6965-
||||||| a246bad76b9
6966-
=======
69676942
/* Start the transaction */
6968-
>>>>>>> mysql-8.0.32
69696943
if (opt_single_transaction && start_transaction(mysql)) goto err;
69706944

69716945
/* Add 'STOP SLAVE to beginning of dump */

‎client/mysqlslap.cc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1782,15 +1782,8 @@ extern "C" void *run_task(void *p) {
17821782
fprintf(stderr, "%s: Error when storing result: %d %s\n",
17831783
my_progname, mysql_errno(mysql), mysql_error(mysql));
17841784
else {
1785-
<<<<<<< HEAD
1786-
while ((row = mysql_fetch_row(result)))
1787-
;
1788-
||||||| a246bad76b9
1789-
while ((row = mysql_fetch_row(result))) counter++;
1790-
=======
17911785
while (mysql_fetch_row(result)) {
17921786
}
1793-
>>>>>>> mysql-8.0.32
17941787
mysql_free_result(result);
17951788
}
17961789
}

‎extra/libcbor/src/cbor/arrays.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ CBOR_EXPORT cbor_item_t* cbor_new_definite_array(size_t size);
9696
*
9797
* @return **new** array or `NULL` upon malloc failure
9898
*/
99-
CBOR_EXPORT cbor_item_t *cbor_new_indefinite_array(void);
99+
CBOR_EXPORT cbor_item_t* cbor_new_indefinite_array();
100100

101101
/** Append to the end
102102
*

‎extra/libcbor/src/cbor/bytestrings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ CBOR_EXPORT bool cbor_bytestring_add_chunk(cbor_item_t *item,
104104
*
105105
* @return **new** definite bytestring. `NULL` on malloc failure.
106106
*/
107-
CBOR_EXPORT cbor_item_t *cbor_new_definite_bytestring(void);
107+
CBOR_EXPORT cbor_item_t *cbor_new_definite_bytestring();
108108

109109
/** Creates a new indefinite byte string
110110
*
111111
* The chunks array is initialized to `NULL` and chunkcount to 0
112112
*
113113
* @return **new** indefinite bytestring. `NULL` on malloc failure.
114114
*/
115-
CBOR_EXPORT cbor_item_t *cbor_new_indefinite_bytestring(void);
115+
CBOR_EXPORT cbor_item_t *cbor_new_indefinite_bytestring();
116116

117117
/** Creates a new byte string and initializes it
118118
*

‎extra/libcbor/src/cbor/floats_ctrls.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,43 +84,43 @@ CBOR_EXPORT bool cbor_get_bool(const cbor_item_t *item);
8484
*
8585
* @return **new** 1B ctrl or `NULL` upon memory allocation failure
8686
*/
87-
CBOR_EXPORT cbor_item_t *cbor_new_ctrl(void);
87+
CBOR_EXPORT cbor_item_t *cbor_new_ctrl();
8888

8989
/** Constructs a new float item
9090
*
9191
* The width cannot be changed once the item is created
9292
*
9393
* @return **new** 2B float or `NULL` upon memory allocation failure
9494
*/
95-
CBOR_EXPORT cbor_item_t *cbor_new_float2(void);
95+
CBOR_EXPORT cbor_item_t *cbor_new_float2();
9696

9797
/** Constructs a new float item
9898
*
9999
* The width cannot be changed once the item is created
100100
*
101101
* @return **new** 4B float or `NULL` upon memory allocation failure
102102
*/
103-
CBOR_EXPORT cbor_item_t *cbor_new_float4(void);
103+
CBOR_EXPORT cbor_item_t *cbor_new_float4();
104104

105105
/** Constructs a new float item
106106
*
107107
* The width cannot be changed once the item is created
108108
*
109109
* @return **new** 8B float or `NULL` upon memory allocation failure
110110
*/
111-
CBOR_EXPORT cbor_item_t *cbor_new_float8(void);
111+
CBOR_EXPORT cbor_item_t *cbor_new_float8();
112112

113113
/** Constructs new null ctrl item
114114
*
115115
* @return **new** null ctrl item or `NULL` upon memory allocation failure
116116
*/
117-
CBOR_EXPORT cbor_item_t *cbor_new_null(void);
117+
CBOR_EXPORT cbor_item_t *cbor_new_null();
118118

119119
/** Constructs new undef ctrl item
120120
*
121121
* @return **new** undef ctrl item or `NULL` upon memory allocation failure
122122
*/
123-
CBOR_EXPORT cbor_item_t *cbor_new_undef(void);
123+
CBOR_EXPORT cbor_item_t *cbor_new_undef();
124124

125125
/** Constructs new boolean ctrl item
126126
*

‎extra/libcbor/src/cbor/internal/stack.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ struct _cbor_stack {
2727
size_t size;
2828
};
2929

30-
struct _cbor_stack _cbor_stack_init(void);
30+
struct _cbor_stack _cbor_stack_init();
3131

3232
void _cbor_stack_pop(struct _cbor_stack *);
3333

‎extra/libcbor/src/cbor/ints.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ CBOR_EXPORT void cbor_mark_negint(cbor_item_t *item);
118118
* @return **new** positive integer or `NULL` on memory allocation failure. The
119119
* value is not initialized
120120
*/
121-
CBOR_EXPORT cbor_item_t *cbor_new_int8(void);
121+
CBOR_EXPORT cbor_item_t *cbor_new_int8();
122122

123123
/** Allocates new integer with 2B width
124124
*
@@ -127,7 +127,7 @@ CBOR_EXPORT cbor_item_t *cbor_new_int8(void);
127127
* @return **new** positive integer or `NULL` on memory allocation failure. The
128128
* value is not initialized
129129
*/
130-
CBOR_EXPORT cbor_item_t *cbor_new_int16(void);
130+
CBOR_EXPORT cbor_item_t *cbor_new_int16();
131131

132132
/** Allocates new integer with 4B width
133133
*
@@ -136,7 +136,7 @@ CBOR_EXPORT cbor_item_t *cbor_new_int16(void);
136136
* @return **new** positive integer or `NULL` on memory allocation failure. The
137137
* value is not initialized
138138
*/
139-
CBOR_EXPORT cbor_item_t *cbor_new_int32(void);
139+
CBOR_EXPORT cbor_item_t *cbor_new_int32();
140140

141141
/** Allocates new integer with 8B width
142142
*
@@ -145,7 +145,7 @@ CBOR_EXPORT cbor_item_t *cbor_new_int32(void);
145145
* @return **new** positive integer or `NULL` on memory allocation failure. The
146146
* value is not initialized
147147
*/
148-
CBOR_EXPORT cbor_item_t *cbor_new_int64(void);
148+
CBOR_EXPORT cbor_item_t *cbor_new_int64();
149149

150150
/** Constructs a new positive integer
151151
*

‎extra/libcbor/src/cbor/maps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ CBOR_EXPORT cbor_item_t *cbor_new_definite_map(size_t size);
4747
* @param size The number of slots to preallocate
4848
* @return **new** definite map. `NULL` on malloc failure.
4949
*/
50-
CBOR_EXPORT cbor_item_t *cbor_new_indefinite_map(void);
50+
CBOR_EXPORT cbor_item_t *cbor_new_indefinite_map();
5151

5252
/** Add a pair to the map
5353
*

‎extra/libcbor/src/cbor/strings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ CBOR_EXPORT bool cbor_string_add_chunk(cbor_item_t *item, cbor_item_t *chunk);
117117
*
118118
* @return **new** definite string. `NULL` on malloc failure.
119119
*/
120-
CBOR_EXPORT cbor_item_t *cbor_new_definite_string(void);
120+
CBOR_EXPORT cbor_item_t *cbor_new_definite_string();
121121

122122
/** Creates a new indefinite string
123123
*
124124
* The chunks array is initialized to `NULL` and chunkcount to 0
125125
*
126126
* @return **new** indefinite string. `NULL` on malloc failure.
127127
*/
128-
CBOR_EXPORT cbor_item_t *cbor_new_indefinite_string(void);
128+
CBOR_EXPORT cbor_item_t *cbor_new_indefinite_string();
129129

130130
/** Creates a new string and initializes it
131131
*

‎extra/robin-hood-hashing/robin_hood.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -203,20 +203,6 @@ static Counts& counts() {
203203
# define ROBIN_HOOD_PRIVATE_DEFINITION_HAS_NATIVE_WCHART() 1
204204
#endif
205205

206-
<<<<<<< HEAD
207-
// workaround missing "is_trivially_copyable" in g++ < 5.0
208-
// See https://stackoverflow.com/a/31798726/48181
209-
#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5
210-
# define ROBIN_HOOD_IS_TRIVIALLY_COPYABLE(...) __has_trivial_copy(__VA_ARGS__)
211-
#else
212-
||||||| a246bad76b9
213-
// workaround missing "is_trivially_copyable" in g++ < 5.0
214-
// See https://stackoverflow.com/a/31798726/48181
215-
#if defined(__GNUC__) && __GNUC__ < 5
216-
# define ROBIN_HOOD_IS_TRIVIALLY_COPYABLE(...) __has_trivial_copy(__VA_ARGS__)
217-
#else
218-
=======
219-
>>>>>>> mysql-8.0.32
220206
# define ROBIN_HOOD_IS_TRIVIALLY_COPYABLE(...) std::is_trivially_copyable<__VA_ARGS__>::value
221207

222208
// helpers for C++ versions, see https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html

‎mysql-test/mysql-test-run.pl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -899,19 +899,9 @@ sub main {
899899
@$completed = grep {$_->{name} ne "shutdown_report"} @$completed;
900900

901901
if (@$completed != $num_tests) {
902-
<<<<<<< HEAD
903902
# Not all tests completed
904-
mtr_report();
905-
mtr_report("Only ", int(@$completed), " of $num_tests completed.");
906-
||||||| a246bad76b9
907-
# Not all tests completed, failure
908-
mtr_report();
909-
mtr_report("Only ", int(@$completed), " of $num_tests completed.");
910-
=======
911-
# Not all tests completed, failure
912903
mtr_print_line();
913904
mtr_report(int(@$completed), " of $num_tests test(s) completed.");
914-
>>>>>>> mysql-8.0.32
915905
foreach (@tests_list) {
916906
$_->{key} = "$_" unless defined $_->{key};
917907
}

‎mysql-test/r/all_persisted_variables.result

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,33 +41,17 @@ include/assert.inc [Expect 500+ variables in the table. Due to open Bugs, we are
4141

4242
# Test SET PERSIST
4343

44-
<<<<<<< HEAD
45-
include/assert.inc [Expect 498 persisted variables in the table.]
46-
||||||| a246bad76b9
47-
include/assert.inc [Expect 448 persisted variables in the table.]
48-
=======
49-
include/assert.inc [Expect 449 persisted variables in the table.]
50-
>>>>>>> mysql-8.0.32
44+
include/assert.inc [Expect 499 persisted variables in the table.]
5145

5246
************************************************************
5347
* 3. Restart server, it must preserve the persisted variable
5448
* settings. Verify persisted configuration.
5549
************************************************************
5650
# restart
5751

58-
<<<<<<< HEAD
59-
include/assert.inc [Expect 498 persisted variables in persisted_variables table.]
60-
include/assert.inc [Expect 498 persisted variables shown as PERSISTED in variables_info table.]
61-
include/assert.inc [Expect 498 persisted variables with matching peristed and global values.]
62-
||||||| a246bad76b9
63-
include/assert.inc [Expect 448 persisted variables in persisted_variables table.]
64-
include/assert.inc [Expect 448 persisted variables shown as PERSISTED in variables_info table.]
65-
include/assert.inc [Expect 448 persisted variables with matching peristed and global values.]
66-
=======
67-
include/assert.inc [Expect 449 persisted variables in persisted_variables table.]
68-
include/assert.inc [Expect 449 persisted variables shown as PERSISTED in variables_info table.]
69-
include/assert.inc [Expect 449 persisted variables with matching peristed and global values.]
70-
>>>>>>> mysql-8.0.32
52+
include/assert.inc [Expect 499 persisted variables in persisted_variables table.]
53+
include/assert.inc [Expect 499 persisted variables shown as PERSISTED in variables_info table.]
54+
include/assert.inc [Expect 499 persisted variables with matching peristed and global values.]
7155

7256
************************************************************
7357
* 4. Test RESET PERSIST IF EXISTS. Verify persisted variable

‎mysql-test/r/default_as_expr_debug.result

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ t1.a CURRENT_TIMESTAMP CURRENT_TIMESTAMP
3838
t1.DB_ROW_ID NULL NULL
3939
t1.DB_TRX_ID NULL NULL
4040
t1.DB_ROLL_PTR NULL NULL
41-
<<<<<<< HEAD
42-
||||||| a246bad76b9
43-
t1.b_dropped_v1 NULL NULL
44-
=======
45-
t1.!hidden!_dropped_v1_p5_b NULL NULL
46-
>>>>>>> mysql-8.0.32
4741
DROP TABLE t1;
4842
#
4943
# Test ALTER table ADD column with DEFAULT

‎mysql-test/r/mysql_config_editor.result

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,8 @@ user = "test_user4"
100100
##############################################
101101
# Tests for mysql_config_editor's help command
102102
##############################################
103-
<<<<<<< HEAD
104-
Copyright (c) 2009-2022 Percona LLC and/or its affiliates
105-
Copyright (c) 2012, 2022, Oracle and/or its affiliates.
106-
||||||| a246bad76b9
107-
Copyright (c) 2012, 2022, Oracle and/or its affiliates.
108-
=======
103+
Copyright (c) 2009-2023 Percona LLC and/or its affiliates
109104
Copyright (c) 2012, 2023, Oracle and/or its affiliates.
110-
>>>>>>> mysql-8.0.32
111105

112106
Oracle is a registered trademark of Oracle Corporation and/or its
113107
affiliates. Other names may be trademarks of their respective

‎mysql-test/r/mysqldump_gtid.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ INSERT INTO t1 VALUES(3);
2929
/*!50717 DEALLOCATE PREPARE s */;
3030
SET @MYSQLDUMP_TEMP_LOG_BIN = @@SESSION.SQL_LOG_BIN;
3131
SET @@SESSION.SQL_LOG_BIN= 0;
32-
/* SET @@GLOBAL.GTID_PURGED='+uuid:1-5';*/
32+
/* SET @@GLOBAL.GTID_PURGED='+uuid:1-4';*/
3333
DROP TABLE IF EXISTS `t1`;
3434
/*!40101 SET @saved_cs_client = @@character_set_client */;
3535
/*!50503 SET character_set_client = utf8mb4 */;

0 commit comments

Comments
 (0)