diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-18 16:16:17 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-18 16:16:17 +0200 |
| commit | dd0823cc03681e6e3e0b7ef9ec26649f70fece48 (patch) | |
| tree | ab790168cd83258fd1e1245376db240a2a4d41fb /mysql-test/r/system_mysql_db.result | |
| parent | 12d9d4963f4b887b04d41635fe1a34ddfbda19cd (diff) | |
| download | mariadb-git-dd0823cc03681e6e3e0b7ef9ec26649f70fece48.tar.gz | |
Bug # 11766011: mysql.user.authentication_string column causes
configuration wizard to fail
Made the fields mysql.user.plugin and mysql.user.authentication_string
nullable to conform with some older clients doing inserts instead of
using the commands.
Diffstat (limited to 'mysql-test/r/system_mysql_db.result')
| -rw-r--r-- | mysql-test/r/system_mysql_db.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index b24f0186506..0e0d555d492 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -120,8 +120,8 @@ 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) unsigned NOT NULL DEFAULT '0', - `plugin` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', - `authentication_string` text COLLATE utf8_bin NOT NULL, + `plugin` char(64) COLLATE utf8_bin DEFAULT '', + `authentication_string` text COLLATE utf8_bin, PRIMARY KEY (`Host`,`User`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges' show create table func; |