summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysql_upgrade_view.result
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-11-07 13:16:29 +0200
committerMonty <monty@mariadb.org>2018-12-09 20:49:05 +0200
commitc82855d88272f0a1b95d0ad2b7abf804aeff8145 (patch)
treed21118e6caaf2f90e2df0a4a2780d7964caa349e /mysql-test/main/mysql_upgrade_view.result
parentae58cd6b87bf1f872093816691ebdd46bef50c7f (diff)
downloadmariadb-git-c82855d88272f0a1b95d0ad2b7abf804aeff8145.tar.gz
Changed some MySQL names in messages to MariaDB
- Remove obsolete documentation files - Removed old obsolete information from some documentation files
Diffstat (limited to 'mysql-test/main/mysql_upgrade_view.result')
-rw-r--r--mysql-test/main/mysql_upgrade_view.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/mysql_upgrade_view.result b/mysql-test/main/mysql_upgrade_view.result
index 3d885c569bb..250e90d2b5c 100644
--- a/mysql-test/main/mysql_upgrade_view.result
+++ b/mysql-test/main/mysql_upgrade_view.result
@@ -210,7 +210,7 @@ v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
show create view v4;
View Create View character_set_client collation_connection
v4 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS select `t1`.`a` AS `a` from `t1` latin1 latin1_swedish_ci
-MySQL upgrade detected
+MariaDB upgrade detected
Phase 1/7: Checking and upgrading mysql database
Processing databases
mysql
@@ -334,7 +334,7 @@ drop view v1,v2,v3,v4;
rename table mysql.event to mysql.ev_bk;
flush tables;
The --upgrade-system-tables option was used, user tables won't be touched.
-MySQL upgrade detected
+MariaDB upgrade detected
Phase 1/7: Checking and upgrading mysql database
Processing databases
mysql