Skip to content

Commit 05e29e1

Browse files
dr-mdr-m
committed
Merge 10.6 into 10.7
2 parents 6a98714 + cc4e20e commit 05e29e1

19 files changed

+98
-54
lines changed

‎cmake/package_name.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ IF(NOT VERSION)
113113
SET(DEFAULT_MACHINE "x86")
114114
ENDIF()
115115
ENDIF()
116-
116+
117+
IF(NOT DEFAULT_MACHINE MATCHES "64" AND 64BIT)
118+
SET(DEFAULT_MACHINE "${DEFAULT_MACHINE}-64bit")
119+
ENDIF()
120+
117121
IF(NOT PLATFORM)
118122
SET(PLATFORM ${DEFAULT_PLATFORM})
119123
ENDIF()

‎mysql-test/suite/galera/r/galera_split_brain.result

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ connection node_1;
77
connection node_2;
88
Killing server ...
99
connection node_1;
10+
SET SESSION lock_wait_timeout= 3;
1011
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
11-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
12+
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
1213
connection node_2;
1314
connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
1415
disconnect node_2;

‎mysql-test/suite/galera/t/galera_split_brain.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ call mtr.add_suppression("WSREP: TO isolation failed for: ");
2222
--source include/kill_galera.inc
2323

2424
--connection node_1
25-
--error ER_LOCK_DEADLOCK
25+
SET SESSION lock_wait_timeout= 3;
26+
--error ER_LOCK_WAIT_TIMEOUT
2627
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
2728

2829
# Reset the master and restart the slave so that post-test checks can run

‎mysql-test/suite/innodb_gis/disabled.def

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@
1010
#
1111
##############################################################################
1212

13+
rtree_concurrent_srch : MDEV-15284 COUNT(*) mismatch
14+
rtree_recovery : MDEV-15284 COUNT(*) mismatch

‎plugin/auth_pam/CMakeLists.txt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,10 @@ IF(HAVE_PAM_APPL_H AND HAVE_GETGROUPLIST)
4242
IF (TARGET auth_pam)
4343
MYSQL_ADD_EXECUTABLE(auth_pam_tool auth_pam_tool.c DESTINATION ${INSTALL_PLUGINDIR}/auth_pam_tool_dir COMPONENT Server)
4444
TARGET_LINK_LIBRARIES(auth_pam_tool pam)
45-
INSTALL(CODE "EXECUTE_PROCESS(
46-
COMMAND chmod u=rwx,g=,o= auth_pam_tool_dir
47-
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
48-
COMPONENT Server)
49-
INSTALL(CODE "EXECUTE_PROCESS(
50-
COMMAND chmod u=rwxs,g=rx,o=rx auth_pam_tool_dir/auth_pam_tool
51-
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
52-
COMPONENT Server)
45+
SET(CPACK_RPM_server_USER_FILELIST ${CPACK_RPM_server_USER_FILELIST}
46+
"%attr(700, -, -) ${INSTALL_PLUGINDIRABS}/auth_pam_tool_dir"
47+
"%attr(4755, -, -) ${INSTALL_PLUGINDIRABS}/auth_pam_tool_dir/auth_pam_tool")
48+
SET(CPACK_RPM_server_USER_FILELIST ${CPACK_RPM_server_USER_FILELIST} PARENT_SCOPE)
5349
ENDIF()
5450
IF(TARGET auth_pam OR TARGET auth_pam_v1)
5551
ADD_SUBDIRECTORY(testing)
@@ -59,7 +55,7 @@ IF(HAVE_PAM_APPL_H AND HAVE_GETGROUPLIST)
5955
IF(INSTALL_PAMDIR)
6056
INSTALL(TARGETS pam_user_map DESTINATION ${INSTALL_PAMDIR} COMPONENT Server)
6157
INSTALL(FILES mapper/user_map.conf DESTINATION ${INSTALL_PAMDATADIR} COMPONENT Server)
62-
SET(CPACK_RPM_server_USER_FILELIST ${CPACK_RPM_server_USER_FILELIST} "%config(noreplace) ${INSTALL_PAMDATADIR}/*" PARENT_SCOPE)
58+
SET(CPACK_RPM_server_USER_FILELIST ${CPACK_RPM_server_USER_FILELIST} "%config(noreplace) ${INSTALL_PAMDATADIRABS}/*" PARENT_SCOPE)
6359
ENDIF()
6460
ENDIF()
6561
ENDIF()

‎sql/handler.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2187,7 +2187,7 @@ int ha_rollback_trans(THD *thd, bool all)
21872187
if (thd->is_error())
21882188
{
21892189
WSREP_DEBUG("ha_rollback_trans(%lld, %s) rolled back: %s: %s; is_real %d",
2190-
thd->thread_id, all?"TRUE":"FALSE", WSREP_QUERY(thd),
2190+
thd->thread_id, all?"TRUE":"FALSE", wsrep_thd_query(thd),
21912191
thd->get_stmt_da()->message(), is_real_trans);
21922192
}
21932193
(void) wsrep_after_rollback(thd, all);

‎sql/sql_insert.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5059,7 +5059,7 @@ bool select_create::send_eof()
50595059
{
50605060
WSREP_DEBUG("select_create commit failed, thd: %llu err: %s %s",
50615061
thd->thread_id,
5062-
wsrep_thd_transaction_state_str(thd), WSREP_QUERY(thd));
5062+
wsrep_thd_transaction_state_str(thd), wsrep_thd_query(thd));
50635063
mysql_mutex_unlock(&thd->LOCK_thd_data);
50645064
abort_result_set();
50655065
DBUG_RETURN(true);

‎sql/sql_parse.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7890,7 +7890,7 @@ static bool wsrep_mysql_parse(THD *thd, char *rawbuf, uint length,
78907890
DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
78917891
});
78927892
WSREP_DEBUG("wsrep retrying AC query: %lu %s",
7893-
thd->wsrep_retry_counter, WSREP_QUERY(thd));
7893+
thd->wsrep_retry_counter, wsrep_thd_query(thd));
78947894
wsrep_prepare_for_autocommit_retry(thd, rawbuf, length, parser_state);
78957895
if (thd->lex->explain)
78967896
delete_explain_query(thd->lex);
@@ -7904,7 +7904,7 @@ static bool wsrep_mysql_parse(THD *thd, char *rawbuf, uint length,
79047904
is_autocommit,
79057905
thd->wsrep_retry_counter,
79067906
thd->variables.wsrep_retry_autocommit,
7907-
WSREP_QUERY(thd));
7907+
wsrep_thd_query(thd));
79087908
my_error(ER_LOCK_DEADLOCK, MYF(0));
79097909
thd->reset_kill_query();
79107910
thd->wsrep_retry_counter= 0; // reset

‎sql/wsrep_client_service.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2018 Codership Oy <info@codership.com>
1+
/* Copyright 2018-2021 Codership Oy <info@codership.com>
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -108,14 +108,14 @@ int Wsrep_client_service::prepare_data_for_replication()
108108
"affected rows: %llu, "
109109
"changed tables: %d, "
110110
"sql_log_bin: %d",
111-
WSREP_QUERY(m_thd),
111+
wsrep_thd_query(m_thd),
112112
m_thd->get_stmt_da()->affected_rows(),
113113
stmt_has_updated_trans_table(m_thd),
114114
m_thd->variables.sql_log_bin);
115115
}
116116
else
117117
{
118-
WSREP_DEBUG("empty rbr buffer, query: %s", WSREP_QUERY(m_thd));
118+
WSREP_DEBUG("empty rbr buffer, query: %s", wsrep_thd_query(m_thd));
119119
}
120120
}
121121
DBUG_RETURN(0);

‎sql/wsrep_high_priority_service.cc

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2018 Codership Oy <info@codership.com>
1+
/* Copyright 2018-2021 Codership Oy <info@codership.com>
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -403,6 +403,16 @@ int Wsrep_high_priority_service::apply_toi(const wsrep::ws_meta& ws_meta,
403403
WSREP_DEBUG("Wsrep_high_priority_service::apply_toi: %lld",
404404
client_state.toi_meta().seqno().get());
405405

406+
DBUG_EXECUTE_IF("sync.wsrep_apply_toi",
407+
{
408+
const char act[]=
409+
"now "
410+
"SIGNAL sync.wsrep_apply_toi_reached "
411+
"WAIT_FOR signal.wsrep_apply_toi";
412+
DBUG_ASSERT(!debug_sync_set_action(thd,
413+
STRING_WITH_LEN(act)));
414+
};);
415+
406416
int ret= apply_events(thd, m_rli, data, err);
407417
wsrep_thd_set_ignored_error(thd, false);
408418
trans_commit(thd);
@@ -447,6 +457,15 @@ int Wsrep_high_priority_service::log_dummy_write_set(const wsrep::ws_handle& ws_
447457
DBUG_PRINT("info",
448458
("Wsrep_high_priority_service::log_dummy_write_set: seqno=%lld",
449459
ws_meta.seqno().get()));
460+
DBUG_EXECUTE_IF("sync.wsrep_log_dummy_write_set",
461+
{
462+
const char act[]=
463+
"now "
464+
"SIGNAL sync.wsrep_log_dummy_write_set_reached ";
465+
DBUG_ASSERT(!debug_sync_set_action(m_thd,
466+
STRING_WITH_LEN(act)));
467+
};);
468+
450469
if (ws_meta.ordered())
451470
{
452471
wsrep::client_state& cs(m_thd->wsrep_cs());
@@ -680,7 +699,7 @@ Wsrep_replayer_service::~Wsrep_replayer_service()
680699
DBUG_ASSERT(0);
681700
WSREP_ERROR("trx_replay failed for: %d, schema: %s, query: %s",
682701
m_replay_status,
683-
orig_thd->db.str, WSREP_QUERY(orig_thd));
702+
orig_thd->db.str, wsrep_thd_query(orig_thd));
684703
unireg_abort(1);
685704
}
686705
}

0 commit comments

Comments
 (0)