Merge branch 'release/1.2.13'

nystudio107 · Mar 17, 2021 · b27cfdb · b27cfdb
2 parents 26e56ba + 33942d8
commit b27cfdb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 1.2.13 - 2020.10.20
 ### Changed
-* Removed the MySQL-specific `--no-tablespaces` from the mysqldump command options
+* Removed the MySQL-specific `--set-gtid-purged=OFF` to the `common_mysql.sh` from the mysqldump command options
 
 ## 1.2.12 - 2020.10.20
 ### Added

diff --git a/scripts/common/common_mysql.sh b/scripts/common/common_mysql.sh
@@ -23,14 +23,14 @@ done
 # Additional arguments for mysqldump
 MYSQLDUMP_ADDITIONAL_ARGS=""
 MYSQLDUMP_ADDITIONAL_ARGS+="--add-drop-table "
+MYSQLDUMP_ADDITIONAL_ARGS+="--no-tablespaces "
 MYSQLDUMP_ADDITIONAL_ARGS+="--comments "
 MYSQLDUMP_ADDITIONAL_ARGS+="--create-options "
 MYSQLDUMP_ADDITIONAL_ARGS+="--dump-date "
 MYSQLDUMP_ADDITIONAL_ARGS+="--no-autocommit "
 MYSQLDUMP_ADDITIONAL_ARGS+="--routines "
 MYSQLDUMP_ADDITIONAL_ARGS+="--set-charset "
 MYSQLDUMP_ADDITIONAL_ARGS+="--triggers "
-MYSQLDUMP_ADDITIONAL_ARGS+="--set-gtid-purged=OFF "
 
 # Arguments to dump just the schema
 MYSQLDUMP_SCHEMA_ARGS=""