2 files changed, 23 insertions, 23 deletions
diff --git a/mysql-test/r/upgrade.result b/mysql-test/r/upgrade.result
index 9d35314d0c6..8a2249480e9 100644
--- a/mysql-test/r/upgrade.result
+++ b/mysql-test/r/upgrade.result
@@ -41,19 +41,19 @@ t1
 t-1
 drop database `mysqltest1`;
 drop database `mysqltest-1`;
-drop table if exists `txu@0023P@0023p1`;
-drop table if exists `txu#P#p1`;
-create table `txu#P#p1` (s1 int);
-insert into `txu#P#p1` values (1);
-select * from `txu@0023P@0023p1`;
-ERROR 42S02: Table 'test.txu@0023P@0023p1' doesn't exist
-create table `txu@0023P@0023p1` (s1 int);
-insert into `txu@0023P@0023p1` values (2);
-select * from `txu@0023P@0023p1`;
+drop table if exists `txu@0023p@0023p1`;
+drop table if exists `txu#p#p1`;
+create table `txu#p#p1` (s1 int);
+insert into `txu#p#p1` values (1);
+select * from `txu@0023p@0023p1`;
+ERROR 42S02: Table 'test.txu@0023p@0023p1' doesn't exist
+create table `txu@0023p@0023p1` (s1 int);
+insert into `txu@0023p@0023p1` values (2);
+select * from `txu@0023p@0023p1`;
 s1
 2
-select * from `txu#P#p1`;
+select * from `txu#p#p1`;
 s1
 1
-drop table `txu@0023P@0023p1`;
-drop table `txu#P#p1`;
+drop table `txu@0023p@0023p1`;
+drop table `txu#p#p1`;
diff --git a/mysql-test/t/upgrade.test b/mysql-test/t/upgrade.test
index f2017d81d5c..5c5046cf7e9 100644
--- a/mysql-test/t/upgrade.test
+++ b/mysql-test/t/upgrade.test
@@ -34,16 +34,16 @@ drop database `mysqltest-1`;
 # Bug#17142: Crash if create with encoded name
 #
 --disable_warnings
-drop table if exists `txu@0023P@0023p1`;
-drop table if exists `txu#P#p1`;
+drop table if exists `txu@0023p@0023p1`;
+drop table if exists `txu#p#p1`;
 --enable_warnings
-create table `txu#P#p1` (s1 int);
-insert into `txu#P#p1` values (1);
+create table `txu#p#p1` (s1 int);
+insert into `txu#p#p1` values (1);
 --error 1146
-select * from `txu@0023P@0023p1`;
-create table `txu@0023P@0023p1` (s1 int);
-insert into `txu@0023P@0023p1` values (2);
-select * from `txu@0023P@0023p1`;
-select * from `txu#P#p1`;
-drop table `txu@0023P@0023p1`;
-drop table `txu#P#p1`;
+select * from `txu@0023p@0023p1`;
+create table `txu@0023p@0023p1` (s1 int);
+insert into `txu@0023p@0023p1` values (2);
+select * from `txu@0023p@0023p1`;
+select * from `txu#p#p1`;
+drop table `txu@0023p@0023p1`;
+drop table `txu#p#p1`;