Merge branch 'MDEV-14992' into MDEV-39101

Author: mariadb-andrzejjarzabek

client/mysqldump.cc

@@ -2817,7 +2817,7 @@ static uint dump_events_for_db(char *db)
                                           C_STRING_WITH_LEN(" EVENT"));
 
           fprintf(sql_file,
-                  "/*!50106 %s */ %s\n",
+                  "/*!50106 %s \n*/ %s\n",
                   (const char *) (query_str != NULL ? query_str : row[3]),
                   (const char *) delimiter);
 
@@ -3043,7 +3043,8 @@ static uint dump_routines_for_db(char *db)
 
             fprintf(sql_file,
                     "DELIMITER ;;\n"
-                    "%s ;;\n"
+                    "%s\n"
+                    ";;\n"
                     "DELIMITER ;\n",
                     (const char *) row[2]);
 
@@ -3420,13 +3421,13 @@ static uint get_table_structure(const char *table, const char *db, char *table_t
             The actual column value doesn't matter anyway, since the view will
             be dropped at run time.
           */
-          fprintf(sql_file, " 1 AS %s",
+          fprintf(sql_file, " NULL AS %s",
                   quote_name(row[0], name_buff, 0));
 
           while((row= mysql_fetch_row(result)))
           {
             /* col name, col type */
-            fprintf(sql_file, ",\n  1 AS %s",
+            fprintf(sql_file, ",\n NULL AS %s",
                     quote_name(row[0], name_buff, 0));
           }
 
@@ -3981,7 +3982,7 @@ static int dump_trigger(FILE *sql_file, MYSQL_RES *show_create_trigger_rs,
                                     C_STRING_WITH_LEN(" TRIGGER"));
     fprintf(sql_file,
             "DELIMITER ;;\n"
-            "/*!50003 %s */;;\n"
+            "/*!50003 %s \n*/;;\n"
             "DELIMITER ;\n",
             (const char *) (query_str != NULL ? query_str : row[2]));
 

client/mysqltest.cc

@@ -6286,7 +6286,7 @@ void func_abs(Expression_value args[], int count, Expression_value *result)
   if (!args[0].is_numeric)
     die("abs() requires numeric argument");
 
-  result->set_int(abs(args[0].to_int()));
+  result->set_int(llabs(args[0].to_int()));
 }
 
 

cmake/cpack_rpm.cmake

@@ -14,6 +14,7 @@ SET(CPACK_COMPONENT_SERVER_GROUP "server")
 SET(CPACK_COMPONENT_INIFILES_GROUP "server")
 SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "server")
 SET(CPACK_COMPONENT_SUPPORTFILES_GROUP "server")
+SET(CPACK_COMPONENT_SERVER_GALERA_GROUP "server-galera")
 SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "devel")
 SET(CPACK_COMPONENT_DEVELOPMENTSYMLINKS_GROUP "devel")
 SET(CPACK_COMPONENT_MANPAGESDEVELOPMENT_GROUP "devel")
@@ -95,6 +96,8 @@ SET(CPACK_RPM_devel_PACKAGE_SUMMARY "MariaDB database development files")
 SET(CPACK_RPM_devel_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
 SET(CPACK_RPM_server_PACKAGE_SUMMARY "MariaDB database server binaries")
 SET(CPACK_RPM_server_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
+SET(CPACK_RPM_server-galera_PACKAGE_SUMMARY "MariaDB database server binaries and scripts for Galera 4")
+SET(CPACK_RPM_server-galera_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
 SET(CPACK_RPM_test_PACKAGE_SUMMARY "MariaDB database regression test suite")
 SET(CPACK_RPM_test_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
 
@@ -258,11 +261,28 @@ SETA(CPACK_RPM_test_PACKAGE_OBSOLETES
   "MySQL-test")
 SETA(CPACK_RPM_test_PACKAGE_PROVIDES
   "MySQL-test")
+IF(WITH_WSREP)
+  SETA(CPACK_RPM_test_PACKAGE_REQUIRES
+    "MariaDB-server-galera = ${SERVER_VERSION}")
+ELSE()
+  SETA(CPACK_RPM_test_PACKAGE_REQUIRES
+    "MariaDB-server = ${SERVER_VERSION}")
+ENDIF()
 
 SETA(CPACK_RPM_server_PACKAGE_REQUIRES
   "MariaDB-common >= 10.6.1"
   "MariaDB-client >= 11.0.0")
 
+IF(WITH_WSREP)
+  SETA(CPACK_RPM_server_galera_PACKAGE_REQUIRES
+    "MariaDB-server >= ${SERVER_VERSION}"
+    "galera-4" "rsync" "grep" "gawk" "iproute"
+    "coreutils" "findutils" "tar")
+  SETA(CPACK_RPM_server_galera_PACKAGE_RECOMMENDS "lsof" "socat" "pv")
+  SETA(CPACK_RPM_server_galera_PACKAGE_CONFLICTS
+    "MariaDB-server <= 12.3.2")
+ENDIF()
+
 SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh)
 SET(CPACK_RPM_server_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-preun.sh)
 SET(CPACK_RPM_server_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postin.sh)

debian/additions/mariadb.conf.d/60-galera.cnf

@@ -9,16 +9,18 @@
 #wsrep_cluster_name       = "MariaDB Galera Cluster"
 
 # Mandatory settings
-#wsrep_provider           = /usr/lib/galera/libgalera_smm.so
+# per https://mariadb.com/docs/galera-cluster/readme/mariadb-galera-cluster-usage-guide#general-configuration
+wsrep_provider           = /usr/lib/galera/libgalera_smm.so
+# Configure address and enable wsrep_on.
 #wsrep_cluster_address    = gcomm://
-#binlog_format            = ROW
 #wsrep_on                 = ON
-#default_storage_engine   = InnoDB
+binlog_format            = ROW
+innodb_autoinc_lock_mode = 2
 
 # Allow server to accept connections on all interfaces.
-#bind-address = 0.0.0.0
+bind-address = 0.0.0.0
 
 # Performance related settings
-#innodb_autoinc_lock_mode = 2
+# https://mariadb.com/docs/galera-cluster/galera-management/configuration/configuring-mariadb-galera-cluster#performance-related-options
 #innodb_flush_log_at_trx_commit = 0
-#wsrep_slave_threads = 1
+#wsrep_slave_threads = 4

debian/control

@@ -971,6 +971,39 @@ Description: MySQL compatibility links to mariadb-server binaries/scripts.
  This package is also useful for users with strong  background in MySQL
  maintenance, but wants to switch to MariaDB
 
+Package: mariadb-server-galera
+Architecture: any
+Depends:
+ galera-4 (>= 26.4),
+ gawk,
+ iproute2 [linux-any],
+ lsof [linux-any],
+ mariadb-server (= ${server:Version}),
+ rsync,
+ socat,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ pv,
+Conflicts:
+ mariadb-galera-server-10.0,
+ mariadb-galera-server-5.5,
+ mariadb-server (<< 1:12.3.2),
+Breaks:
+ mariadb-server (<< 1:12.3.2),
+Description: MariaDB scripts and configuration needed by Galera cluster
+ MariaDB Galera Cluster is a virtually synchronous multi-primary
+ cluster for MariaDB.
+ .
+ Galera is the underlying replication plugin that makes this clustering
+ possible. It provides write-set replication with group communication
+ primitives to ensure data consistency across all nodes in real-time.
+ .
+ The library enables active-active multi-master topologies with automatic
+ membership control, supports both incremental (IST) and snapshot (SST)
+ state transfers, and guarantees no transaction loss on node failures
+ through its virtually synchronous replication protocol.
+
 Package: mariadb-backup
 Architecture: any
 Breaks:
@@ -1302,9 +1335,10 @@ Description: Snappy compression support in the server and storage engines
 
 Package: mariadb-plugin-videx
 Architecture: any
-Depends: mariadb-server (= ${server:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ mariadb-server (= ${server:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Virtual index engine for what-if analysis in MariaDB
  The VIDEX storage engine allows developers and DBAs to perform what-if
  analysis by evaluating the impact of potential indexes on query plans.
@@ -1316,7 +1350,7 @@ Architecture: any
 Depends:
  libnet-ssleay-perl,
  mariadb-client (= ${binary:Version}),
- mariadb-server (= ${server:Version}),
+ mariadb-server-galera (= ${server:Version}),
  mariadb-test-data (= ${source:Version}),
  virtual-mysql-testsuite,
  ${misc:Depends},

debian/mariadb-client.install

@@ -2,7 +2,6 @@ debian/additions/innotop/innotop usr/bin/
 debian/additions/mariadb-report usr/bin/
 debian/additions/mariadb.conf.d/50-client.cnf etc/mysql/mariadb.conf.d
 debian/additions/mariadb.conf.d/50-mariadb-clients.cnf etc/mysql/mariadb.conf.d
-debian/additions/mariadb.conf.d/60-galera.cnf etc/mysql/mariadb.conf.d
 usr/bin/mariadb-access
 usr/bin/mariadb-admin
 usr/bin/mariadb-binlog

debian/mariadb-server-galera.install

@@ -0,0 +1,20 @@
+etc/mysql/mariadb.conf.d/wsrep_info.cnf
+debian/additions/mariadb.conf.d/60-galera.cnf etc/mysql/mariadb.conf.d
+lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
+lib/systemd/system/mariadb.service.d/galera.conf
+usr/bin/galera_new_cluster
+usr/bin/galera_recovery
+usr/bin/wsrep_sst_common
+usr/bin/wsrep_sst_mariabackup
+usr/bin/wsrep_sst_mysqldump
+usr/bin/wsrep_sst_rsync
+usr/bin/wsrep_sst_rsync_wan
+usr/lib/mysql/plugin/wsrep_info.so
+usr/share/man/man1/galera_new_cluster.1
+usr/share/man/man1/galera_recovery.1
+usr/share/man/man1/wsrep_sst_common.1
+usr/share/man/man1/wsrep_sst_mariabackup.1
+usr/share/man/man1/wsrep_sst_mysqldump.1
+usr/share/man/man1/wsrep_sst_rsync.1
+usr/share/man/man1/wsrep_sst_rsync_wan.1
+usr/share/mariadb/wsrep_notify

debian/mariadb-server.install

@@ -11,7 +11,6 @@ lib/systemd/system/mariadb-extra@.socket
 lib/systemd/system/mariadb.service
 lib/systemd/system/mariadb@.service
 lib/systemd/system/mariadb@.socket
-lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
 lib/systemd/system/mysql.service
 lib/systemd/system/mysqld.service
 support-files/rpm/enable_encryption.preset etc/mysql/mariadb.conf.d/99-enable-encryption.cnf.preset
@@ -20,8 +19,6 @@ usr/bin/aria_dump_log
 usr/bin/aria_ftdump
 usr/bin/aria_pack
 usr/bin/aria_read_log
-usr/bin/galera_new_cluster
-usr/bin/galera_recovery
 usr/bin/mariadb-service-convert
 usr/bin/mariadbd-multi
 usr/bin/mariadbd-safe
@@ -30,11 +27,6 @@ usr/bin/myisam_ftdump
 usr/bin/myisamchk
 usr/bin/myisamlog
 usr/bin/myisampack
-usr/bin/wsrep_sst_common
-usr/bin/wsrep_sst_mariabackup
-usr/bin/wsrep_sst_mysqldump
-usr/bin/wsrep_sst_rsync
-usr/bin/wsrep_sst_rsync_wan
 usr/lib/mysql/plugin/auth_ed25519.so
 usr/lib/mysql/plugin/auth_mysql_sha2.so
 usr/lib/mysql/plugin/auth_pam.so
@@ -58,16 +50,13 @@ usr/lib/mysql/plugin/server_audit.so
 usr/lib/mysql/plugin/simple_password_check.so
 usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/mysql/plugin/type_mysql_json.so
-usr/lib/mysql/plugin/wsrep_info.so
 usr/lib/tmpfiles.d/mariadb.conf
 usr/share/doc/mariadb-server/mariadbd.sym.gz
 usr/share/man/man1/aria_chk.1
 usr/share/man/man1/aria_dump_log.1
 usr/share/man/man1/aria_ftdump.1
 usr/share/man/man1/aria_pack.1
 usr/share/man/man1/aria_read_log.1
-usr/share/man/man1/galera_new_cluster.1
-usr/share/man/man1/galera_recovery.1
 usr/share/man/man1/mariadb-service-convert.1
 usr/share/man/man1/mariadbd-multi.1
 usr/share/man/man1/mariadbd-safe-helper.1
@@ -76,11 +65,4 @@ usr/share/man/man1/myisam_ftdump.1
 usr/share/man/man1/myisamchk.1
 usr/share/man/man1/myisamlog.1
 usr/share/man/man1/myisampack.1
-usr/share/man/man1/wsrep_sst_common.1
-usr/share/man/man1/wsrep_sst_mariabackup.1
-usr/share/man/man1/wsrep_sst_mysqldump.1
-usr/share/man/man1/wsrep_sst_rsync.1
-usr/share/man/man1/wsrep_sst_rsync_wan.1
 usr/share/mariadb/mini-benchmark
-usr/share/mariadb/wsrep.cnf
-usr/share/mariadb/wsrep_notify

debian/mariadb-server.links

@@ -1,2 +1,3 @@
 interest-noawait /etc/mysql
 interest-noawait /etc/systemd/system/mariadb.service.d
+interest-noawait /lib/systemd/system/mariadb.service.d