From 407af92c21848291ccff43a87a97c6fff5e7679f Mon Sep 17 00:00:00 2001 From: Dan Wendorf Date: Thu, 27 Oct 2016 16:11:08 -0700 Subject: [PATCH] provider/google Change default MySQL instance version to 5.6 (#9674) The Google Cloud SQL API defaults to 5.6, and 5.6 is the only version avaiable to both first- and second-generation Cloud SQL instances. --- builtin/providers/google/resource_sql_database_instance.go | 2 +- .../docs/providers/google/r/sql_database_instance.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/providers/google/resource_sql_database_instance.go b/builtin/providers/google/resource_sql_database_instance.go index 7ee5b5d66a13..128e4b74bc6e 100644 --- a/builtin/providers/google/resource_sql_database_instance.go +++ b/builtin/providers/google/resource_sql_database_instance.go @@ -154,7 +154,7 @@ func resourceSqlDatabaseInstance() *schema.Resource { "database_version": &schema.Schema{ Type: schema.TypeString, Optional: true, - Default: "MYSQL_5_5", + Default: "MYSQL_5_6", ForceNew: true, }, diff --git a/website/source/docs/providers/google/r/sql_database_instance.html.markdown b/website/source/docs/providers/google/r/sql_database_instance.html.markdown index c6db7cc029ab..7eab5f1fbfe8 100644 --- a/website/source/docs/providers/google/r/sql_database_instance.html.markdown +++ b/website/source/docs/providers/google/r/sql_database_instance.html.markdown @@ -37,7 +37,7 @@ The following arguments are supported: - - - -* `database_version` - (Optional, Default: `MYSQL_5_5`) The MySQL version to +* `database_version` - (Optional, Default: `MYSQL_5_6`) The MySQL version to use. Can be either `MYSQL_5_5` or `MYSQL_5_6`. * `name` - (Optional, Computed) The name of the instance. If the name is left