database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4

Browse Source
This commit is contained in:
Alexander Barkov
2019-08-13 11:42:31 +04:00
parent ae1d17f52d 43882e764d
commit 95cdc1ca5f
67 changed files with 986 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/switch_to_mysql_user.inc
View File

@ -48,7 +48,7 @@ CREATE TABLE mysql.user (
is_role enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
default_role char(80) binary DEFAULT '' NOT NULL,
max_statement_time decimal(12,6) DEFAULT 0 NOT NULL,
PRIMARY KEY Host (Host,User)
PRIMARY KEY (Host,User)
) engine=Aria transactional=1 CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';
insert mysql.user select * from mysql.user_bak;
rename table mysql.global_priv to mysql.global_priv_bak;