1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge branch '10.10' into 10.11

This commit is contained in:
Oleksandr Byelkin
2023-11-08 16:46:47 +01:00
560 changed files with 13069 additions and 8461 deletions

View File

@@ -3725,8 +3725,13 @@ int main(int argc, char** argv)
if (tmpdir.list)
free_tmpdir(&tmpdir);
if (result_file && result_file != stdout)
my_fclose(result_file, MYF(0));
if (result_file)
{
if (result_file != stdout)
my_fclose(result_file, MYF(0));
else
fflush(result_file);
}
/*
Ensure the GTID state is correct. If not, end in error.