Skip to content

Commit 28f08d3

Browse files
sanja-byelkinsanja-byelkin
committed
Merge branch '10.1' into 10.2
2 parents 3866589 + f1bcfbb commit 28f08d3

File tree

321 files changed

+6845
-195812
lines changed

Some content is hidden

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

321 files changed

+6845
-195812
lines changed

‎config.h.cmake

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -569,12 +569,8 @@
569569
#cmakedefine WSREP_PROC_INFO 1
570570
#endif
571571

572-
#ifdef _AIX
573-
/*
574-
AIX includes inttypes.h from sys/types.h
575-
Explicitly request format macros before the first inclusion of inttypes.h
576-
*/
572+
#if !defined(__STDC_FORMAT_MACROS)
577573
#define __STDC_FORMAT_MACROS
578-
#endif
574+
#endif // !defined(__STDC_FORMAT_MACROS)
579575

580576
#endif

‎extra/mariabackup/fil_cur.cc

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -344,39 +344,39 @@ xb_fil_cur_read(
344344
page += page_size, i++) {
345345
ulint page_no = cursor->buf_page_no + i;
346346

347-
if (cursor->space_id == TRX_SYS_SPACE &&
348-
page_no >= FSP_EXTENT_SIZE &&
349-
page_no < FSP_EXTENT_SIZE * 3) {
350-
/* We ignore the doublewrite buffer pages */
351-
} else if (!fil_space_verify_crypt_checksum(
352-
page, cursor->page_size, space->id, page_no)
353-
&& buf_page_is_corrupted(true, page,
354-
cursor->page_size,
355-
space)) {
356-
retry_count--;
357-
if (retry_count == 0) {
358-
msg("[%02u] mariabackup: "
359-
"Error: failed to read page after "
360-
"10 retries. File %s seems to be "
361-
"corrupted.\n", cursor->thread_n,
362-
cursor->abs_path);
363-
ret = XB_FIL_CUR_ERROR;
364-
break;
365-
}
366-
367-
if (retry_count == 9) {
368-
msg("[%02u] mariabackup: "
369-
"Database page corruption detected at page "
370-
ULINTPF ", retrying...\n",
371-
cursor->thread_n, page_no);
372-
}
373-
374-
os_thread_sleep(100000);
375-
376-
goto read_retry;
377-
}
378-
cursor->buf_read += page_size;
379-
cursor->buf_npages++;
347+
if (cursor->space_id == TRX_SYS_SPACE &&
348+
page_no >= FSP_EXTENT_SIZE &&
349+
page_no < FSP_EXTENT_SIZE * 3) {
350+
/* We ignore the doublewrite buffer pages */
351+
} else if (!fil_space_verify_crypt_checksum(
352+
page, cursor->page_size, space->id, page_no)
353+
&& buf_page_is_corrupted(true, page,
354+
cursor->page_size,
355+
space)) {
356+
retry_count--;
357+
if (retry_count == 0) {
358+
msg("[%02u] mariabackup: "
359+
"Error: failed to read page after "
360+
"10 retries. File %s seems to be "
361+
"corrupted.\n", cursor->thread_n,
362+
cursor->abs_path);
363+
ret = XB_FIL_CUR_ERROR;
364+
break;
365+
}
366+
367+
if (retry_count == 9) {
368+
msg("[%02u] mariabackup: "
369+
"Database page corruption detected at page "
370+
ULINTPF ", retrying...\n",
371+
cursor->thread_n, page_no);
372+
}
373+
374+
os_thread_sleep(100000);
375+
376+
goto read_retry;
377+
}
378+
cursor->buf_read += page_size;
379+
cursor->buf_npages++;
380380
}
381381

382382
posix_fadvise(cursor->file, offset, to_read, POSIX_FADV_DONTNEED);

‎include/my_atomic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ make_atomic_store(ptr)
359359
#define MY_ATOMIC_NOT_1CPU 1
360360
extern int my_atomic_initialize();
361361

362-
#ifdef __ATOMIC_SEQ_CST
362+
#ifdef HAVE_GCC_C11_ATOMICS
363363
#define MY_MEMORY_ORDER_RELAXED __ATOMIC_RELAXED
364364
#define MY_MEMORY_ORDER_CONSUME __ATOMIC_CONSUME
365365
#define MY_MEMORY_ORDER_ACQUIRE __ATOMIC_ACQUIRE

‎include/my_global.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,9 @@
255255
AIX includes inttypes.h from sys/types.h
256256
Explicitly request format macros before the first inclusion of inttypes.h
257257
*/
258-
#define __STDC_FORMAT_MACROS
258+
#if !defined(__STDC_FORMAT_MACROS)
259+
#define __STDC_FORMAT_MACROS
260+
#endif // !defined(__STDC_FORMAT_MACROS)
259261
#endif
260262

261263

‎include/my_service_manager.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
sd-daemon.h may include inttypes.h. Explicitly request format macros before
2525
the first inclusion of inttypes.h.
2626
*/
27+
#if !defined(__STDC_FORMAT_MACROS)
2728
#define __STDC_FORMAT_MACROS
29+
#endif // !defined(__STDC_FORMAT_MACROS)
2830
#include <systemd/sd-daemon.h>
2931
/** INTERVAL in seconds followed by printf style status */
3032
#define service_manager_extend_timeout(INTERVAL, FMTSTR, ...) \

‎include/mysql/service_wsrep.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ extern struct wsrep_service_st {
110110
int (*wsrep_trx_is_aborting_func)(MYSQL_THD thd);
111111
int (*wsrep_trx_order_before_func)(MYSQL_THD, MYSQL_THD);
112112
void (*wsrep_unlock_rollback_func)();
113+
void (*wsrep_set_data_home_dir_func)(const char *data_dir);
113114
} *wsrep_service;
114115

115116
#ifdef MYSQL_DYNAMIC_PLUGIN
@@ -151,6 +152,7 @@ extern struct wsrep_service_st {
151152
#define wsrep_trx_is_aborting(T) wsrep_service->wsrep_trx_is_aborting_func(T)
152153
#define wsrep_trx_order_before(T1,T2) wsrep_service->wsrep_trx_order_before_func(T1,T2)
153154
#define wsrep_unlock_rollback() wsrep_service->wsrep_unlock_rollback_func()
155+
#define wsrep_set_data_home_dir(A) wsrep_service->wsrep_set_data_home_dir_func(A)
154156

155157
#define wsrep_debug get_wsrep_debug()
156158
#define wsrep_log_conflicts get_wsrep_log_conflicts()
@@ -208,6 +210,7 @@ void wsrep_thd_awake(THD *thd, my_bool signal);
208210
void wsrep_thd_set_conflict_state(THD *thd, enum wsrep_conflict_state state);
209211
bool wsrep_thd_ignore_table(THD *thd);
210212
void wsrep_unlock_rollback();
213+
void wsrep_set_data_home_dir(const char *data_dir);
211214

212215
#endif
213216

‎include/service_versions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@
4141
#define VERSION_thd_specifics 0x0100
4242
#define VERSION_thd_timezone 0x0100
4343
#define VERSION_thd_wait 0x0100
44-
#define VERSION_wsrep 0x0201
44+
#define VERSION_wsrep 0x0202

‎include/wsrep.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
if (WSREP_ON && WSREP(thd) && wsrep_to_isolation_begin(thd, db_, table_, table_list_)) \
2828
goto error;
2929

30+
#define WSREP_TO_ISOLATION_BEGIN_ALTER(db_, table_, table_list_, alter_info_) \
31+
if (WSREP_ON && WSREP(thd) && wsrep_to_isolation_begin(thd, db_, table_, \
32+
table_list_, alter_info_)) \
33+
goto error;
34+
3035
#define WSREP_TO_ISOLATION_END \
3136
if (WSREP_ON && (WSREP(thd) || (thd && thd->wsrep_exec_mode==TOTAL_ORDER))) \
3237
wsrep_to_isolation_end(thd);

‎mysql-test/extra/binlog_tests/binlog.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
-- source include/have_log_bin.inc
66
-- source include/not_embedded.inc
77
-- source include/have_innodb.inc
8-
-- source include/have_debug.inc
98

109
--disable_warnings
1110
drop table if exists t1, t2;

‎mysql-test/extra/rpl_tests/rpl_foreign_key.test

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)