From 76d243beb9b4880bdbdd93d429a72f62d2924f8a Mon Sep 17 00:00:00 2001
From: Laurynas Biveinis <laurynas.biveinis@gmail.com>
Date: Fri, 17 Aug 2018 09:43:23 +0300
Subject: [PATCH] PS-269 (Initial Percona Server 8.0 tree)

Trivial testcase updates
---
 internal/mysql-test/suite/i_main/r/update.result |  2 +-
 internal/mysql-test/suite/i_main/t/update.test   |  2 +-
 mysql-test/r/mysqlshow_ci.result                 | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/internal/mysql-test/suite/i_main/r/update.result b/internal/mysql-test/suite/i_main/r/update.result
index 7105bbef35d4..00d36a07c886 100644
--- a/internal/mysql-test/suite/i_main/r/update.result
+++ b/internal/mysql-test/suite/i_main/r/update.result
@@ -8,7 +8,7 @@ a int,
 b int,
 PRIMARY KEY (id1,id2),
 KEY (id1, a)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 INSERT INTO `t1` VALUES (1,1,NULL,1);
 INSERT INTO `t1` VALUES (2,2,1,NULL);
 INSERT INTO `t1` VALUES (2,6,NULL,2);
diff --git a/internal/mysql-test/suite/i_main/t/update.test b/internal/mysql-test/suite/i_main/t/update.test
index c927ec0ead2f..704a7ea71123 100644
--- a/internal/mysql-test/suite/i_main/t/update.test
+++ b/internal/mysql-test/suite/i_main/t/update.test
@@ -8,7 +8,7 @@ CREATE TABLE t1 (
  b int,
  PRIMARY KEY (id1,id2),
  KEY (id1, a)
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 INSERT INTO `t1` VALUES (1,1,NULL,1);
 INSERT INTO `t1` VALUES (2,2,1,NULL);
diff --git a/mysql-test/r/mysqlshow_ci.result b/mysql-test/r/mysqlshow_ci.result
index 7cfd28e35f6d..a5d4be50e455 100644
--- a/mysql-test/r/mysqlshow_ci.result
+++ b/mysql-test/r/mysqlshow_ci.result
@@ -80,6 +80,7 @@ Database: information_schema
 |                Tables                 |
 +---------------------------------------+
 | CHARACTER_SETS                        |
+| CLIENT_STATISTICS                     |
 | COLLATION_CHARACTER_SET_APPLICABILITY |
 | COLLATIONS                            |
 | COLUMN_PRIVILEGES                     |
@@ -88,10 +89,13 @@ Database: information_schema
 | ENGINES                               |
 | EVENTS                                |
 | FILES                                 |
+| GLOBAL_TEMPORARY_TABLES               |
+| INDEX_STATISTICS                      |
 | INNODB_BUFFER_PAGE                    |
 | INNODB_BUFFER_PAGE_LRU                |
 | INNODB_BUFFER_POOL_STATS              |
 | INNODB_CACHED_INDEXES                 |
+| INNODB_CHANGED_PAGES                  |
 | INNODB_CMP                            |
 | INNODB_CMP_PER_INDEX                  |
 | INNODB_CMP_PER_INDEX_RESET            |
@@ -136,10 +140,14 @@ Database: information_schema
 | STATISTICS                            |
 | TABLE_CONSTRAINTS                     |
 | TABLE_PRIVILEGES                      |
+| TABLE_STATISTICS                      |
 | TABLES                                |
 | TABLESPACES                           |
+| TEMPORARY_TABLES                      |
+| THREAD_STATISTICS                     |
 | TRIGGERS                              |
 | USER_PRIVILEGES                       |
+| USER_STATISTICS                       |
 | VIEWS                                 |
 +---------------------------------------+
 Database: INFORMATION_SCHEMA
@@ -147,6 +155,7 @@ Database: INFORMATION_SCHEMA
 |                Tables                 |
 +---------------------------------------+
 | CHARACTER_SETS                        |
+| CLIENT_STATISTICS                     |
 | COLLATION_CHARACTER_SET_APPLICABILITY |
 | COLLATIONS                            |
 | COLUMN_PRIVILEGES                     |
@@ -155,10 +164,13 @@ Database: INFORMATION_SCHEMA
 | ENGINES                               |
 | EVENTS                                |
 | FILES                                 |
+| GLOBAL_TEMPORARY_TABLES               |
+| INDEX_STATISTICS                      |
 | INNODB_BUFFER_PAGE                    |
 | INNODB_BUFFER_PAGE_LRU                |
 | INNODB_BUFFER_POOL_STATS              |
 | INNODB_CACHED_INDEXES                 |
+| INNODB_CHANGED_PAGES                  |
 | INNODB_CMP                            |
 | INNODB_CMP_PER_INDEX                  |
 | INNODB_CMP_PER_INDEX_RESET            |
@@ -203,10 +215,14 @@ Database: INFORMATION_SCHEMA
 | STATISTICS                            |
 | TABLE_CONSTRAINTS                     |
 | TABLE_PRIVILEGES                      |
+| TABLE_STATISTICS                      |
 | TABLES                                |
 | TABLESPACES                           |
+| TEMPORARY_TABLES                      |
+| THREAD_STATISTICS                     |
 | TRIGGERS                              |
 | USER_PRIVILEGES                       |
+| USER_STATISTICS                       |
 | VIEWS                                 |
 +---------------------------------------+
 Wildcard: inf_rmation_schema