diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 08:14:04 -0700 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 08:14:04 -0700 |
| commit | cdb5510204f7d04242bb11e8d97509627af8afc0 (patch) | |
| tree | 333cf134954e15896f5ad83b5c544a44397bf8ff /mysql-test/r/system_mysql_db_fix40123.result | |
| parent | 72d8b533cc102aad6be5046a0fe8b8e63ec1e218 (diff) | |
| download | mariadb-git-cdb5510204f7d04242bb11e8d97509627af8afc0.tar.gz | |
fix mysql_upgrade to preserve the collation of mysql.user.is_role
Diffstat (limited to 'mysql-test/r/system_mysql_db_fix40123.result')
| -rw-r--r-- | mysql-test/r/system_mysql_db_fix40123.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/system_mysql_db_fix40123.result b/mysql-test/r/system_mysql_db_fix40123.result index 052e2966f70..3c811f78a4f 100644 --- a/mysql-test/r/system_mysql_db_fix40123.result +++ b/mysql-test/r/system_mysql_db_fix40123.result @@ -125,7 +125,7 @@ user CREATE TABLE `user` ( `max_updates` int(11) unsigned NOT NULL DEFAULT '0', `max_connections` int(11) unsigned NOT NULL DEFAULT '0', `max_user_connections` int(11) NOT NULL DEFAULT '0', - `is_role` enum('N','Y') COLLATE utf8_bin NOT NULL DEFAULT 'N', + `is_role` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', `plugin` char(64) CHARACTER SET latin1 NOT NULL DEFAULT '', `authentication_string` text COLLATE utf8_bin NOT NULL, PRIMARY KEY (`Host`,`User`) |