database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-01-29 15:41:05 +01:00
parent a85d942be9 e2b50213cf
commit 41a163ac5c
354 changed files with 3955 additions and 1103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/mysql_upgrade_view.result
View File

@ -211,7 +211,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
@ -336,7 +336,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