Merge branch '2.4.14' into 2.4

This commit is contained in:
Markus Mäkelä
2020-11-23 12:48:24 +02:00
631 changed files with 683 additions and 642 deletions

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -2,7 +2,7 @@
threads=###threads###
log_info=1
###xpad_server###
###xpand_server###
[Xpand-Monitor]
type=monitor
@ -18,6 +18,7 @@ cluster=Xpand-Monitor
user=maxskysql
password=skysql
transaction_replay=true
transaction_replay_retry_on_deadlock=true
[RCR]
type=service

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General
@ -133,24 +133,25 @@ int Xpand_nodes::start_replication()
{
int rv = 1;
std::string cluster_setup_sql = std::string("ALTER CLUSTER ADD '")
+ std::string(IP_private[1])
+ std::string("'");
for (int i = 2; i < N; i++)
{
cluster_setup_sql += std::string(",'")
+ std::string(IP_private[i])
+ std::string("'");
}
connect();
execute_query(nodes[0], "%s", cluster_setup_sql.c_str());
// The nodes must be added one by one to the cluster. An attempt to add them
// all with one ALTER command will fail, if one or more of them already are in
// the cluster.
for (int i = 1; i < N; ++i)
{
std::string cluster_setup_sql = std::string("ALTER CLUSTER ADD '")
+ std::string(IP_private[i])
+ std::string("'");
execute_query(nodes[0], "%s", cluster_setup_sql.c_str());
}
close_connections();
rv = 0;
return rv;
}

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General

View File

@ -4,7 +4,7 @@
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2024-10-14
* Change Date: 2024-11-16
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General