diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
| commit | 95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1 (patch) | |
| tree | 20f91c9dfc995df26363073737c34e8fe565bfe6 /mysql-test/include | |
| parent | ae1d17f52de045b37e0894e1e6684a911a43696c (diff) | |
| parent | 43882e764d6867c6855b1ff057758a3f08b25c55 (diff) | |
| download | mariadb-git-95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1.tar.gz | |
Merge commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/switch_to_mysql_user.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/switch_to_mysql_user.inc b/mysql-test/include/switch_to_mysql_user.inc index f5801db6114..4d67f30a10b 100644 --- a/mysql-test/include/switch_to_mysql_user.inc +++ b/mysql-test/include/switch_to_mysql_user.inc @@ -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; |