summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2018-10-12 06:15:21 +0400
committerAlexander Barkov <bar@mariadb.com>2018-10-12 06:34:13 +0400
commit6120ae4acafb23badecc623e33797949e3f6fbbb (patch)
treef998ce7ed5e8fc2bf62574b7c6ec93d8ef04569c /mysql-test/suite
parentce643ddac78ce66cdef9e4c0164ce7f8fbcf2da0 (diff)
downloadmariadb-git-6120ae4acafb23badecc623e33797949e3f6fbbb.tar.gz
Adjusting old tests and adding new tests for "MDEV-8765: mysqldump -use utf8mb4 by default"
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result2
-rw-r--r--mysql-test/suite/compat/oracle/t/sp-package-mysqldump.test1
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result b/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
index 1a8e01a992f..21bead42b0a 100644
--- a/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
+++ b/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
@@ -38,7 +38,7 @@ $$
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES utf8mb4 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
diff --git a/mysql-test/suite/compat/oracle/t/sp-package-mysqldump.test b/mysql-test/suite/compat/oracle/t/sp-package-mysqldump.test
index 8f50c1fc4b0..6f3d7964521 100644
--- a/mysql-test/suite/compat/oracle/t/sp-package-mysqldump.test
+++ b/mysql-test/suite/compat/oracle/t/sp-package-mysqldump.test
@@ -1,3 +1,4 @@
+--source include/have_utf8mb4.inc
--source include/not_embedded.inc
SET sql_mode=ORACLE;