Merge branch 'release/1.2.11'

nystudio107 · Aug 11, 2020 · 9caf40a · 9caf40a
2 parents ca4a59d + e0104b2
commit 9caf40a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Craft-Scripts Changelog
 
+## 1.2.11 - 2020.08.11
+### Changed
+* Added `--no-tablespaces` to the mysqldump command options to work around changes in MySQL
+
 ## 1.2.10 - 2018.11.23
 ### Changed
 * Don’t dump permission/ownership info for postgres

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "nystudio107/craft-scripts",
     "description": "Shell scripts to manage database backups, asset backups, file permissions, asset syncing, cache clearing, and database syncing between Craft CMS environments",
-    "version": "1.2.10",
+    "version": "1.2.11",
     "keywords": [
         "craft",
         "craftcms",

diff --git a/scripts/common/common_mysql.sh b/scripts/common/common_mysql.sh
@@ -23,6 +23,7 @@ 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 "

diff --git a/scripts/pull_db.sh b/scripts/pull_db.sh
@@ -2,7 +2,7 @@
 
 # Pull Database
 #
-# Pull remote database down from a remote and restore it to to local
+# Pull remote database down from a remote and restore it to local
 #
 # @author    nystudio107
 # @copyright Copyright (c) 2017 nystudio107