Merge remote-tracking branch 'connect/10.2' into 10.2

Author: sanja-byelkin

storage/connect/ha_connect.cc

@@ -4700,9 +4700,6 @@ int ha_connect::start_stmt(THD *thd, thr_lock_type lock_type)
   PGLOBAL g= GetPlug(thd, xp);
   DBUG_ENTER("ha_connect::start_stmt");
 
-	if (table->triggers)
-		g->More= 1;			// We don't know which columns are used by the trigger
-
   if (check_privileges(thd, GetTableOptionStruct(), table->s->db.str, true))
     DBUG_RETURN(HA_ERR_INTERNAL_ERROR);
 

storage/connect/mysql-test/connect/r/xml.result

@@ -158,47 +158,47 @@ TRANSLATOR	NULL
 PUBLISHER	Eyrolles Paris
 DATEPUB	1998
 SELECT LOAD_FILE('MYSQLD_DATADIR/test/xsample2.xml') AS xml;
-xml	<?xml version="1.0" encoding="UTF-8"?>
-<BIBLIO SUBJECT="XML">
-	<BOOK ISBN="9782212090819" LANG="fr" SUBJECT="applications">
-		<AUTHOR>
-			<FIRSTNAME>Jean-Christophe</FIRSTNAME>
-			<LASTNAME>Bernadac</LASTNAME>
-		</AUTHOR>
-		<AUTHOR>
-			<FIRSTNAME>François</FIRSTNAME>
-			<LASTNAME>Knab</LASTNAME>
-		</AUTHOR>
-		<TITLE>Construire une application XML</TITLE>
-		<PUBLISHER>
-			<NAME>Eyrolles</NAME>
-			<PLACE>Paris</PLACE>
-		</PUBLISHER>
-		<DATEPUB>1999</DATEPUB>
-	</BOOK>
-	<BOOK ISBN="9782840825685" LANG="fr" SUBJECT="applications">
-		<AUTHOR>
-			<FIRSTNAME>William J.</FIRSTNAME>
-			<LASTNAME>Pardi</LASTNAME>
-		</AUTHOR>
-		<TRANSLATOR PREFIX="adapté de l'anglais par">
-			<FIRSTNAME>James</FIRSTNAME>
-			<LASTNAME>Guerin</LASTNAME>
-		</TRANSLATOR>
-		<TITLE>XML en Action</TITLE>
-		<PUBLISHER>
-			<NAME>Microsoft Press</NAME>
-			<PLACE>Paris</PLACE>
-		</PUBLISHER>
-		<DATEPUB>1999</DATEPUB>
-	</BOOK>
-	<BOOK ISBN="9782212090529" LANG="fr" SUBJECT="général">
-		<AUTHOR>Alain Michard</AUTHOR>
-		<TITLE>XML, Langage et Applications</TITLE>
-		<PUBLISHER>Eyrolles Paris</PUBLISHER>
-		<DATEPUB>1998</DATEPUB>
-	</BOOK>
-</BIBLIO>
+xml	<?xml version="1.0" encoding="UTF-8"?>
+<BIBLIO SUBJECT="XML">
+	<BOOK ISBN="9782212090819" LANG="fr" SUBJECT="applications">
+		<AUTHOR>
+			<FIRSTNAME>Jean-Christophe</FIRSTNAME>
+			<LASTNAME>Bernadac</LASTNAME>
+		</AUTHOR>
+		<AUTHOR>
+			<FIRSTNAME>François</FIRSTNAME>
+			<LASTNAME>Knab</LASTNAME>
+		</AUTHOR>
+		<TITLE>Construire une application XML</TITLE>
+		<PUBLISHER>
+			<NAME>Eyrolles</NAME>
+			<PLACE>Paris</PLACE>
+		</PUBLISHER>
+		<DATEPUB>1999</DATEPUB>
+	</BOOK>
+	<BOOK ISBN="9782840825685" LANG="fr" SUBJECT="applications">
+		<AUTHOR>
+			<FIRSTNAME>William J.</FIRSTNAME>
+			<LASTNAME>Pardi</LASTNAME>
+		</AUTHOR>
+		<TRANSLATOR PREFIX="adapté de l'anglais par">
+			<FIRSTNAME>James</FIRSTNAME>
+			<LASTNAME>Guerin</LASTNAME>
+		</TRANSLATOR>
+		<TITLE>XML en Action</TITLE>
+		<PUBLISHER>
+			<NAME>Microsoft Press</NAME>
+			<PLACE>Paris</PLACE>
+		</PUBLISHER>
+		<DATEPUB>1999</DATEPUB>
+	</BOOK>
+	<BOOK ISBN="9782212090529" LANG="fr" SUBJECT="général">
+		<AUTHOR>Alain Michard</AUTHOR>
+		<TITLE>XML, Langage et Applications</TITLE>
+		<PUBLISHER>Eyrolles Paris</PUBLISHER>
+		<DATEPUB>1998</DATEPUB>
+	</BOOK>
+</BIBLIO>
 
 DROP TABLE t1;
 #
@@ -374,7 +374,7 @@ INSERT INTO t1 VALUES (_cp1251 0xC0C1C2C3);
 Warnings:
 Level	Warning
 Code	1105
-Message	Com error: Unable to save character to 'iso-8859-1' encoding.
+Message	Com error: Unable to save character to 'iso-8859-1' encoding.
 
 INSERT INTO t1 VALUES ('&<>"\'');
 SELECT node, hex(node) FROM t1;
@@ -383,11 +383,11 @@ hex(node)	263C3E2227
 DROP TABLE t1;
 SET @a=LOAD_FILE('MYSQLD_DATADIR/test/t1.xml');
 SELECT CAST(@a AS CHAR CHARACTER SET latin1);
-CAST(@a AS CHAR CHARACTER SET latin1)	<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Created by the MariaDB CONNECT Storage Engine-->
-<t1>
-	<line>
-		<node>&amp;&lt;&gt;"'</node>
-	</line>
-</t1>
+CAST(@a AS CHAR CHARACTER SET latin1)	<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Created by the MariaDB CONNECT Storage Engine-->
+<t1>
+	<line>
+		<node>&amp;&lt;&gt;"'</node>
+	</line>
+</t1>