@@ -1202,8 +1202,9 @@ public function create_db(): void {
12021202 return ;
12031203 }
12041204
1205- $ dbname = self ::$ db_settings ['dbname ' ];
1206- self ::run_sql ( self ::$ mysql_binary . ' --no-defaults --ssl-verify-server-cert ' , [ 'execute ' => "CREATE DATABASE IF NOT EXISTS $ dbname " ] );
1205+ $ dbname = self ::$ db_settings ['dbname ' ];
1206+ $ ssl_flag = ( false !== strpos ( self ::$ mysql_binary , 'mariadb ' ) ) ? ' --ssl-verify-server-cert ' : '' ;
1207+ self ::run_sql ( self ::$ mysql_binary . ' --no-defaults ' . $ ssl_flag , [ 'execute ' => "CREATE DATABASE IF NOT EXISTS $ dbname " ] );
12071208 }
12081209
12091210 /**
@@ -1214,8 +1215,9 @@ public function test_connection(): void {
12141215 return ;
12151216 }
12161217
1218+ $ ssl_flag = ( false !== strpos ( self ::$ mysql_binary , 'mariadb ' ) ) ? ' --ssl-verify-server-cert ' : '' ;
12171219 $ sql_result = self ::run_sql (
1218- self ::$ mysql_binary . ' --no-defaults --ssl-verify-server-cert ' ,
1220+ self ::$ mysql_binary . ' --no-defaults ' . $ ssl_flag ,
12191221 [
12201222 'execute ' => 'SELECT 1 ' ,
12211223 'send_to_shell ' => false ,
@@ -1241,8 +1243,9 @@ public function drop_db(): void {
12411243 if ( 'sqlite ' === self ::$ db_type ) {
12421244 return ;
12431245 }
1244- $ dbname = self ::$ db_settings ['dbname ' ];
1245- self ::run_sql ( self ::$ mysql_binary . ' --no-defaults --ssl-verify-server-cert ' , [ 'execute ' => "DROP DATABASE IF EXISTS $ dbname " ] );
1246+ $ dbname = self ::$ db_settings ['dbname ' ];
1247+ $ ssl_flag = ( false !== strpos ( self ::$ mysql_binary , 'mariadb ' ) ) ? ' --ssl-verify-server-cert ' : '' ;
1248+ self ::run_sql ( self ::$ mysql_binary . ' --no-defaults ' . $ ssl_flag , [ 'execute ' => "DROP DATABASE IF EXISTS $ dbname " ] );
12461249 }
12471250
12481251 /**
@@ -1479,7 +1482,8 @@ public function install_wp( $subdir = '', $version = '' ): void {
14791482 if ( 'sqlite ' === self ::$ db_type ) {
14801483 copy ( "{$ install_cache_path }.sqlite " , "$ run_dir/wp-content/database/.ht.sqlite " );
14811484 } else {
1482- self ::run_sql ( self ::$ mysql_binary . ' --no-defaults --ssl-verify-server-cert ' , [ 'execute ' => "source {$ install_cache_path }.sql " ], true /*add_database*/ );
1485+ $ ssl_flag = ( false !== strpos ( self ::$ mysql_binary , 'mariadb ' ) ) ? ' --ssl-verify-server-cert ' : '' ;
1486+ self ::run_sql ( self ::$ mysql_binary . ' --no-defaults ' . $ ssl_flag , [ 'execute ' => "source {$ install_cache_path }.sql " ], true /*add_database*/ );
14831487 }
14841488 } else {
14851489 $ this ->proc ( 'wp core install ' , $ install_args , $ subdir )->run_check ();
@@ -1492,7 +1496,8 @@ public function install_wp( $subdir = '', $version = '' ): void {
14921496 $ mysqldump_binary = Utils \get_sql_dump_command ();
14931497 $ mysqldump_binary = Utils \force_env_on_nix_systems ( $ mysqldump_binary );
14941498 $ support_column_statistics = exec ( "{$ mysqldump_binary } --help | grep 'column-statistics' " );
1495- $ command = "{$ mysqldump_binary } --no-defaults --ssl-verify-server-cert --no-tablespaces " ;
1499+ $ ssl_flag = ( false !== strpos ( $ mysqldump_binary , 'mariadb ' ) ) ? ' --ssl-verify-server-cert ' : '' ;
1500+ $ command = "{$ mysqldump_binary } --no-defaults {$ ssl_flag } --no-tablespaces " ;
14961501 if ( $ support_column_statistics ) {
14971502 $ command .= ' --skip-column-statistics ' ;
14981503 }
0 commit comments