diff options
Diffstat (limited to 'mysql-test/main/ps.result')
| -rw-r--r-- | mysql-test/main/ps.result | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/mysql-test/main/ps.result b/mysql-test/main/ps.result index 7cd6484d7ff..9dc2c8dfded 100644 --- a/mysql-test/main/ps.result +++ b/mysql-test/main/ps.result @@ -1109,12 +1109,12 @@ show create table mysqltest.t1; Table Create Table t1 CREATE TABLE `t1` ( `c` char(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci show create table mysqltest.t2; Table Create Table t2 CREATE TABLE `t2` ( `test` varchar(4) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci drop table mysqltest.t1; drop table mysqltest.t2; alter database mysqltest character set latin1; @@ -1728,7 +1728,7 @@ set @@character_set_server= utf8; execute stmt; show create database mysqltest_1; Database Create Database -mysqltest_1 CREATE DATABASE `mysqltest_1` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci */ +mysqltest_1 CREATE DATABASE `mysqltest_1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */ drop database mysqltest_1; deallocate prepare stmt; set @@character_set_server= @old_character_set_server; @@ -2726,9 +2726,7 @@ ERROR 42000: FUNCTION test.func_1 does not exist drop function func_1; ERROR 42000: FUNCTION test.func_1 does not exist prepare abc from "create event xyz on schedule at now() do select 123"; -ERROR HY000: This command is not supported in the prepared statement protocol yet deallocate prepare abc; -ERROR HY000: Unknown prepared statement handler (abc) given to DEALLOCATE PREPARE drop event if exists xyz; create event xyz on schedule every 5 minute disable do select 123; create procedure proc_1() alter event xyz comment 'xyz'; @@ -2748,9 +2746,7 @@ drop procedure proc_1; create function func_1() returns int begin alter event xyz comment 'xyz'; return 1; end| ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger prepare abc from "alter event xyz comment 'xyz'"; -ERROR HY000: This command is not supported in the prepared statement protocol yet deallocate prepare abc; -ERROR HY000: Unknown prepared statement handler (abc) given to DEALLOCATE PREPARE drop event if exists xyz; create event xyz on schedule every 5 minute disable do select 123; create procedure proc_1() drop event xyz; @@ -2765,9 +2761,7 @@ drop procedure proc_1; create function func_1() returns int begin drop event xyz; return 1; end| ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger prepare abc from "drop event xyz"; -ERROR HY000: This command is not supported in the prepared statement protocol yet deallocate prepare abc; -ERROR HY000: Unknown prepared statement handler (abc) given to DEALLOCATE PREPARE drop table if exists t1; create table t1 (a int, b char(5)) engine=myisam; insert into t1 values (1, "one"), (2, "two"), (3, "three"); @@ -2979,7 +2973,7 @@ execute stmt; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` char(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, + `c` char(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, KEY `c` (`c`(10)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; @@ -2987,7 +2981,7 @@ execute stmt; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` char(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, + `c` char(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, KEY `c` (`c`(10)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; @@ -3087,15 +3081,15 @@ DROP TABLE t1; CREATE TABLE t1(f1 INT); INSERT INTO t1 VALUES (1),(1); PREPARE stmt FROM 'EXPLAIN SELECT 1 FROM t1 WHERE (SELECT (SELECT 1 FROM t1 GROUP BY f1))'; +Warnings: +Note 1249 Select 2 was reduced during optimization EXECUTE stmt; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 -2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL No tables used 3 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort EXECUTE stmt; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 -2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL No tables used 3 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort DEALLOCATE PREPARE stmt; DROP TABLE t1; @@ -4944,7 +4938,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp PREPARE stmt FROM CONCAT(NULL); 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 'NULL' at line 1 EXECUTE IMMEDIATE ? USING 'SELECT 1'; -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 '? USING 'SELECT 1'' at line 1 +Got one of the listed errors EXECUTE IMMEDIATE 10; 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 '10' at line 1 EXECUTE IMMEDIATE TIME'10:20:30'; @@ -5273,7 +5267,7 @@ CREATE TABLE t1 AS SELECT @a AS c1; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` longtext CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `c1` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; DROP PROCEDURE p1; |