Adjusted test results.

mysql-test/r/mysqld--help,win.rdiff

@@ -42,9 +42,9 @@
   --stack-trace       Print a symbolic stack trace on failure
   (Defaults to on; use --skip-stack-trace to disable.)
 + --standalone        Dummy option to start as a standalone program (NT).
-  --stored-program-cache=# 
-  The soft upper limit for number of cached stored routines
-  for one connection.
+  --standards-compliant-cte 
+  Allow only standards compiant CTE
+  (Defaults to on; use --skip-standards-compliant-cte to disable.)
 @@ -1070,25 +1078,11 @@
   --thread-cache-size=# 
   How many threads we should keep in a cache for reuse.

mysql-test/suite/funcs_1/r/myisam_views-big.result

@@ -4000,7 +4000,7 @@ DROP VIEW  IF EXISTS v2 ;
 CREATE TABLE t1 (f1 BIGINT) ;
 SET @x=0;
 CREATE or REPLACE VIEW v1 AS Select 1 INTO @x;
-ERROR HY000: View's SELECT contains a 'INTO' clause
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @x' at line 1
 Select @x;
 @x
 0

mysql-test/suite/sys_vars/r/sysvars_server_embedded.result

@@ -1983,6 +1983,20 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	MAX_RECURSION_LEVEL
+SESSION_VALUE	4294967295
+GLOBAL_VALUE	4294967295
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	4294967295
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Maximum number of iterations when executing recursive queries
+NUMERIC_MIN_VALUE	0
+NUMERIC_MAX_VALUE	4294967295
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	MAX_SEEKS_FOR_KEY
 SESSION_VALUE	4294967295
 GLOBAL_VALUE	4294967295
@@ -3733,6 +3747,20 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NULL
+VARIABLE_NAME	STANDARDS_COMPLIANT_CTE
+SESSION_VALUE	ON
+GLOBAL_VALUE	ON
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	ON
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	Allow only standards compiant CTE
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	STORAGE_ENGINE
 SESSION_VALUE	MyISAM
 GLOBAL_VALUE	MyISAM