Merge pull request #5374 from planetscale/morgo-mariadb-10-4

Add mysqlctl support for MariaDB 10.4

config/mycnf/master_mariadb104.cnf

@@ -0,0 +1,23 @@
+# This file is auto-included when MariaDB 10.4 is detected.
+
+# enable strict mode so it's safe to compare sequence numbers across different server IDs.
+gtid_strict_mode = 1
+innodb_stats_persistent = 0
+
+# Semi-sync replication is required for automated unplanned failover
+# (when the master goes away). Here we just load the plugin so it's
+# available if desired, but it's disabled at startup.
+#
+# If the -enable_semi_sync flag is used, VTTablet will enable semi-sync
+# at the proper time when replication is set up, or when masters are
+# promoted or demoted.
+
+# semi_sync has been merged into master as of mariadb 10.3 so this is no longer needed 
+#plugin-load = rpl_semi_sync_master=semisync_master.so;rpl_semi_sync_slave=semisync_slave.so
+
+# When semi-sync is enabled, don't allow fallback to async
+# if you get no ack, or have no slaves. This is necessary to
+# prevent alternate futures when doing a failover in response to
+# a master that becomes unresponsive.
+rpl_semi_sync_master_timeout = 1000000000000000000
+rpl_semi_sync_master_wait_no_slave = 1

go/vt/mysqlctl/capabilityset.go

@@ -46,10 +46,16 @@ func (c *capabilitySet) hasMySQLUpgradeInServer() bool {
 func (c *capabilitySet) hasInitializeInServer() bool {
  return c.isMySQLLike() && c.version.atLeast(serverVersion{Major: 5, Minor: 7, Patch: 0})
 }
+func (c *capabilitySet) hasMaria104InstallDb() bool {
+ return c.isMariaDB() && c.version.atLeast(serverVersion{Major: 10, Minor: 4, Patch: 0})
+}
 
 // IsMySQLLike tests if the server is either MySQL
 // or Percona Server. At least currently, Vitess doesn't
 // make use of any specific Percona Server features.
 func (c *capabilitySet) isMySQLLike() bool {
  return c.flavor == flavorMySQL || c.flavor == flavorPercona
 }
+func (c *capabilitySet) isMariaDB() bool {
+ return c.flavor == flavorMariaDB
+}

go/vt/mysqlctl/mysqld.go

@@ -742,6 +742,9 @@ func (mysqld *Mysqld) installDataDir(cnf *Mycnf) error {
  "--defaults-file=" + cnf.path,
  "--basedir=" + mysqlBaseDir,
  }
+ if mysqld.capabilities.hasMaria104InstallDb() {
+ args = append(args, "--auth-root-authentication-method=normal")
+ }
  cmdPath, err := binaryPath(mysqlRoot, "mysql_install_db")
  if err != nil {
  return err