Merge 10.9 into 10.10

mysql-test/dgcov.pl

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1335 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
 
 # Run gcov and report test coverage on only those code lines touched by
 # a given list of commits.

mysql-test/main/ctype_collate_context.result

@@ -654,11 +654,11 @@ result	ERROR: Conflicting declarations: 'CHARACTER SET utf8mb4' and 'CHARACTER S
 
 query	CREATE DATABASE
 attrs	COLLATE DEFAULT CHARACTER SET utf8mb4 CHARACTER SET latin1
-result	ERROR: COLLATION 'utf8mb4_general_ci' is not valid for CHARACTER SET 'latin1'
+result	ERROR: Conflicting declarations: 'CHARACTER SET utf8mb4' and 'CHARACTER SET latin1'
 
 query	CREATE DATABASE
 attrs	COLLATE utf8mb4_bin CHARACTER SET utf8mb4 CHARACTER SET latin1
-result	ERROR: COLLATION 'utf8mb4_bin' is not valid for CHARACTER SET 'latin1'
+result	ERROR: Conflicting declarations: 'CHARACTER SET utf8mb4' and 'CHARACTER SET latin1'
 
 query	CREATE DATABASE
 attrs	COLLATE latin1_swedish_ci CHARACTER SET utf8mb4 CHARACTER SET latin1
@@ -674,7 +674,7 @@ result	ERROR: Conflicting declarations: 'CHARACTER SET DEFAULT (utf8mb4)' and 'C
 
 query	CREATE DATABASE
 attrs	CHARACTER SET utf8mb4 COLLATE DEFAULT CHARACTER SET latin1
-result	ERROR: COLLATION 'utf8mb4_general_ci' is not valid for CHARACTER SET 'latin1'
+result	ERROR: Conflicting declarations: 'CHARACTER SET utf8mb4' and 'CHARACTER SET latin1'
 
 query	CREATE DATABASE
 attrs	COLLATE utf8mb4_bin COLLATE DEFAULT CHARACTER SET latin1
@@ -694,7 +694,7 @@ result	ERROR: COLLATION 'utf8mb4_bin' is not valid for CHARACTER SET 'latin1'
 
 query	CREATE DATABASE
 attrs	CHARACTER SET utf8mb4 COLLATE utf8mb4_bin CHARACTER SET latin1
-result	ERROR: COLLATION 'utf8mb4_bin' is not valid for CHARACTER SET 'latin1'
+result	ERROR: Conflicting declarations: 'CHARACTER SET utf8mb4' and 'CHARACTER SET latin1'
 
 query	CREATE DATABASE
 attrs	COLLATE DEFAULT COLLATE utf8mb4_bin CHARACTER SET latin1
@@ -774,19 +774,19 @@ result	ERROR: Conflicting declarations: 'CHARACTER SET utf8mb4' and 'CHARACTER S
 
 query	CREATE DATABASE
 attrs	COLLATE DEFAULT CHARACTER SET latin1 CHARACTER SET utf8mb4
-result	ERROR: COLLATION 'latin1_swedish_ci' is not valid for CHARACTER SET 'utf8mb4'
+result	ERROR: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb4'
 
 query	CREATE DATABASE
 attrs	COLLATE utf8mb4_bin CHARACTER SET latin1 CHARACTER SET utf8mb4
 result	ERROR: COLLATION 'utf8mb4_bin' is not valid for CHARACTER SET 'latin1'
 
 query	CREATE DATABASE
 attrs	COLLATE latin1_swedish_ci CHARACTER SET latin1 CHARACTER SET utf8mb4
-result	ERROR: COLLATION 'latin1_swedish_ci' is not valid for CHARACTER SET 'utf8mb4'
+result	ERROR: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb4'
 
 query	CREATE DATABASE
 attrs	COLLATE latin1_bin CHARACTER SET latin1 CHARACTER SET utf8mb4
-result	ERROR: COLLATION 'latin1_bin' is not valid for CHARACTER SET 'utf8mb4'
+result	ERROR: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb4'
 
 query	CREATE DATABASE
 attrs	CHARACTER SET latin1 CHARACTER SET utf8mb4 CHARACTER SET utf8mb4
@@ -802,7 +802,7 @@ result	ERROR: COLLATION 'latin1_bin' is not valid for CHARACTER SET 'utf8mb4'
 
 query	CREATE DATABASE
 attrs	CHARACTER SET latin1 COLLATE DEFAULT CHARACTER SET utf8mb4
-result	ERROR: COLLATION 'latin1_swedish_ci' is not valid for CHARACTER SET 'utf8mb4'
+result	ERROR: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb4'
 
 query	CREATE DATABASE
 attrs	COLLATE utf8mb4_bin COLLATE DEFAULT CHARACTER SET utf8mb4
@@ -838,7 +838,7 @@ result	ERROR: COLLATION 'latin1_swedish_ci' is not valid for CHARACTER SET 'utf8
 
 query	CREATE DATABASE
 attrs	CHARACTER SET latin1 COLLATE latin1_swedish_ci CHARACTER SET utf8mb4
-result	ERROR: COLLATION 'latin1_swedish_ci' is not valid for CHARACTER SET 'utf8mb4'
+result	ERROR: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb4'
 
 query	CREATE DATABASE
 attrs	CHARACTER SET utf8mb4 COLLATE latin1_swedish_ci CHARACTER SET utf8mb4
@@ -866,7 +866,7 @@ result	ERROR: COLLATION 'latin1_bin' is not valid for CHARACTER SET 'utf8mb4'
 
 query	CREATE DATABASE
 attrs	CHARACTER SET latin1 COLLATE latin1_bin CHARACTER SET utf8mb4
-result	ERROR: COLLATION 'latin1_bin' is not valid for CHARACTER SET 'utf8mb4'
+result	ERROR: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8mb4'
 
 query	CREATE DATABASE
 attrs	CHARACTER SET utf8mb4 COLLATE latin1_bin CHARACTER SET utf8mb4

mysql-test/main/ctype_collate_database.result

@@ -104,3 +104,27 @@ DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME
 utf8mb4	utf8mb4_bin
 DROP DATABASE db1;
 DROP VIEW cscl;
+#
+# MDEV-28117 Multiple conflicting table COLLATE clauses are not rejected
+#
+CREATE DATABASE db1 COLLATE latin1_swedish_ci COLLATE latin1_bin;
+ERROR HY000: Conflicting declarations: 'COLLATE latin1_swedish_ci' and 'COLLATE latin1_bin'
+#
+# MDEV-27906 CREATE TABLE/DATABASE .. CHARSET .. COLLATE is not consistent on errors
+#
+SET collation_server=utf8mb4_unicode_ci;
+CREATE DATABASE db1 COLLATE latin1_bin CHARACTER SET DEFAULT;
+ERROR 42000: COLLATION 'latin1_bin' is not valid for CHARACTER SET 'utf8mb4'
+CREATE DATABASE db1 CHARACTER SET DEFAULT COLLATE latin1_bin;
+ERROR 42000: COLLATION 'latin1_bin' is not valid for CHARACTER SET 'utf8mb4'
+SET collation_server=DEFAULT;
+CREATE DATABASE db1 COLLATE latin1_bin CHARACTER SET DEFAULT;
+SHOW CREATE DATABASE db1;
+Database	Create Database
+db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_bin */
+DROP DATABASE db1;
+CREATE DATABASE db1 CHARACTER SET DEFAULT COLLATE latin1_bin;
+SHOW CREATE DATABASE db1;
+Database	Create Database
+db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_bin */
+DROP DATABASE db1;

mysql-test/main/ctype_collate_database.test

@@ -94,3 +94,31 @@ SELECT * FROM cscl;
 DROP DATABASE db1;
 
 DROP VIEW cscl;
+
+
+--echo #
+--echo # MDEV-28117 Multiple conflicting table COLLATE clauses are not rejected
+--echo #
+
+--error ER_CONFLICTING_DECLARATIONS
+CREATE DATABASE db1 COLLATE latin1_swedish_ci COLLATE latin1_bin;
+
+
+--echo #
+--echo # MDEV-27906 CREATE TABLE/DATABASE .. CHARSET .. COLLATE is not consistent on errors
+--echo #
+
+SET collation_server=utf8mb4_unicode_ci;
+--error ER_COLLATION_CHARSET_MISMATCH
+CREATE DATABASE db1 COLLATE latin1_bin CHARACTER SET DEFAULT;
+--error ER_COLLATION_CHARSET_MISMATCH
+CREATE DATABASE db1 CHARACTER SET DEFAULT COLLATE latin1_bin;
+SET collation_server=DEFAULT;
+
+CREATE DATABASE db1 COLLATE latin1_bin CHARACTER SET DEFAULT;
+SHOW CREATE DATABASE db1;
+DROP DATABASE db1;
+
+CREATE DATABASE db1 CHARACTER SET DEFAULT COLLATE latin1_bin;
+SHOW CREATE DATABASE db1;
+DROP DATABASE db1;

mysql-test/main/ctype_collate_table.result

@@ -25,3 +25,33 @@ t1	CREATE TABLE `t1` (
   `a` char(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4
 DROP TABLE t1;
+#
+# MDEV-28117 Multiple conflicting table COLLATE clauses are not rejected
+#
+CREATE TABLE t1 (a CHAR(10)) COLLATE latin1_swedish_ci COLLATE latin1_bin;
+ERROR HY000: Conflicting declarations: 'COLLATE latin1_swedish_ci' and 'COLLATE latin1_bin'
+#
+# MDEV-27906 CREATE TABLE/DATABASE .. CHARSET .. COLLATE is not consistent on errors
+#
+CREATE DATABASE db1 CHARACTER SET utf8mb4;
+USE db1;
+CREATE TABLE t1 (a CHAR) COLLATE latin1_bin CHARACTER SET DEFAULT;
+ERROR 42000: COLLATION 'latin1_bin' is not valid for CHARACTER SET 'utf8mb4'
+CREATE TABLE t1 (a CHAR) CHARACTER SET DEFAULT COLLATE latin1_bin;
+ERROR 42000: COLLATION 'latin1_bin' is not valid for CHARACTER SET 'utf8mb4'
+DROP DATABASE db1;
+USE test;
+CREATE TABLE t1 (a CHAR) COLLATE latin1_bin CHARACTER SET DEFAULT;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` char(1) COLLATE latin1_bin DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
+DROP TABLE t1;
+CREATE TABLE t1 (a CHAR) CHARACTER SET DEFAULT COLLATE latin1_bin;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` char(1) COLLATE latin1_bin DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
+DROP TABLE t1;

mysql-test/main/ctype_collate_table.test

@@ -20,3 +20,32 @@ DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(10)) CHARACTER SET utf8mb4 COLLATE DEFAULT;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
+
+--echo #
+--echo # MDEV-28117 Multiple conflicting table COLLATE clauses are not rejected
+--echo #
+
+--error ER_CONFLICTING_DECLARATIONS
+CREATE TABLE t1 (a CHAR(10)) COLLATE latin1_swedish_ci COLLATE latin1_bin;
+
+
+--echo #
+--echo # MDEV-27906 CREATE TABLE/DATABASE .. CHARSET .. COLLATE is not consistent on errors
+--echo #
+
+CREATE DATABASE db1 CHARACTER SET utf8mb4;
+USE db1;
+--error ER_COLLATION_CHARSET_MISMATCH
+CREATE TABLE t1 (a CHAR) COLLATE latin1_bin CHARACTER SET DEFAULT;
+--error ER_COLLATION_CHARSET_MISMATCH
+CREATE TABLE t1 (a CHAR) CHARACTER SET DEFAULT COLLATE latin1_bin;
+DROP DATABASE db1;
+USE test;
+
+CREATE TABLE t1 (a CHAR) COLLATE latin1_bin CHARACTER SET DEFAULT;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (a CHAR) CHARACTER SET DEFAULT COLLATE latin1_bin;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;

plugin/user_variables/user_variables.cc

@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1335 USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 #define MYSQL_SERVER
 #include <my_global.h>

sql/lex_charset.cc

@@ -72,6 +72,20 @@ bool Lex_exact_charset::
 }
 
 
+bool Lex_exact_charset_opt_extended_collate::
+  raise_if_charsets_differ(const Lex_exact_charset &cs) const
+{
+  if (!my_charset_same(m_ci, cs.charset_info()))
+  {
+    my_error(ER_CONFLICTING_DECLARATIONS, MYF(0),
+             "CHARACTER SET ", m_ci->cs_name.str,
+             "CHARACTER SET ", cs.charset_info()->cs_name.str);
+    return true;
+  }
+  return false;
+}
+
+
 bool Lex_exact_charset_opt_extended_collate::
   raise_if_not_applicable(const Lex_exact_collation &cl) const
 {
@@ -386,8 +400,7 @@ CHARSET_INFO *Lex_exact_charset_extended_collation_attrs_st::
   case TYPE_EMPTY:
     return def;
   case TYPE_CHARACTER_SET:
-    DBUG_ASSERT(m_ci);
-    return m_ci;
+  case TYPE_CHARACTER_SET_COLLATE_EXACT:
   case TYPE_COLLATE_EXACT:
     DBUG_ASSERT(m_ci);
     return m_ci;
@@ -418,11 +431,13 @@ bool Lex_exact_charset_extended_collation_attrs_st::
   case TYPE_CHARACTER_SET:
     {
       // CHARACTER SET latin1 .. COLLATE latin1_swedish_ci
-      if (Lex_exact_charset(m_ci).raise_if_not_applicable(cl))
+      Lex_exact_charset_opt_extended_collate tmp(m_ci, false);
+      if (tmp.merge_exact_collation(cl))
         return true;
-      *this= Lex_exact_charset_extended_collation_attrs(cl);
+      *this= Lex_exact_charset_extended_collation_attrs(tmp);
       return false;
     }
+  case TYPE_CHARACTER_SET_COLLATE_EXACT:
   case TYPE_COLLATE_EXACT:
     {
       // [CHARACTER SET latin1] COLLATE latin1_bin .. COLLATE latin1_bin
@@ -460,9 +475,10 @@ bool Lex_exact_charset_extended_collation_attrs_st::
       Lex_exact_charset_opt_extended_collate tmp(m_ci, false);
       if (tmp.merge_context_collation(cl))
         return true;
-      *this= Lex_exact_charset_extended_collation_attrs(tmp.collation());
+      *this= Lex_exact_charset_extended_collation_attrs(tmp);
       return false;
     }
+  case TYPE_CHARACTER_SET_COLLATE_EXACT:
   case TYPE_COLLATE_EXACT:
     // [CHARACTER SET latin1] COLLATE latin1_swedish_ci .. COLLATE DEFAULT
     return Lex_exact_collation(m_ci).
@@ -538,15 +554,23 @@ bool Lex_exact_charset_extended_collation_attrs_st::
 
   case TYPE_COLLATE_EXACT:
     // COLLATE latin1_bin .. CHARACTER SET cs
-    return cs.raise_if_not_applicable(Lex_exact_collation(m_ci));
+    if (cs.raise_if_not_applicable(Lex_exact_collation(m_ci)))
+      return true;
+    m_type= TYPE_CHARACTER_SET_COLLATE_EXACT;
+    return false;
+
+  case TYPE_CHARACTER_SET_COLLATE_EXACT:
+    // CHARACTER SET cs1 COLLATE cl .. CHARACTER SET cs2
+    return Lex_exact_charset_opt_extended_collate(m_ci, true).
+             raise_if_charsets_differ(cs);
 
   case TYPE_COLLATE_CONTEXTUALLY_TYPED:
     // COLLATE DEFAULT .. CHARACTER SET cs
     {
       Lex_exact_charset_opt_extended_collate tmp(cs);
       if (tmp.merge_context_collation(Lex_context_collation(m_ci)))
         return true;
-      *this= Lex_exact_charset_extended_collation_attrs(tmp.collation());
+      *this= Lex_exact_charset_extended_collation_attrs(tmp);
       return false;
     }
   }
@@ -567,7 +591,6 @@ bool Lex_extended_charset_extended_collation_attrs_st::merge_charset_default()
 bool Lex_extended_charset_extended_collation_attrs_st::
        merge_exact_charset(const Lex_exact_charset &cs)
 {
-  m_had_charset_exact= true;
   if (m_charset_order == CHARSET_TYPE_EMPTY)
     m_charset_order= CHARSET_TYPE_EXACT;
   return Lex_exact_charset_extended_collation_attrs_st::merge_exact_charset(cs);
@@ -621,6 +644,7 @@ Lex_extended_charset_extended_collation_attrs_st::
     }
     return m_ci;
 
+  case TYPE_CHARACTER_SET_COLLATE_EXACT:
   case TYPE_COLLATE_EXACT:
   {
     /*
@@ -629,7 +653,7 @@ Lex_extended_charset_extended_collation_attrs_st::
         [ CHARACTER SET cs_exact ]
         CHARACTER SET DEFAULT;
     */
-    if (m_had_charset_exact &&
+    if (m_type == TYPE_CHARACTER_SET_COLLATE_EXACT &&
         raise_if_charset_conflicts_with_default(ctx.charset_default()))
     {
       /*