diff options
| -rw-r--r-- | mysql-test/r/grant_4332.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/grant_4332.test | 7 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/grant_4332.result b/mysql-test/r/grant_4332.result index f0286173b4c..ef92b62ab32 100644 --- a/mysql-test/r/grant_4332.result +++ b/mysql-test/r/grant_4332.result @@ -1,4 +1,3 @@ -set global event_scheduler = on; select user(); Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr def user() 253 77 14 N 1 31 8 @@ -13,7 +12,7 @@ alter table mysql.columns_priv modify User char(80) binary not null default ''; alter table mysql.procs_priv modify User char(80) binary not null default ''; alter table mysql.proc modify definer char(141) collate utf8_bin not null default ''; alter table mysql.event modify definer char(141) collate utf8_bin not null default ''; -flush privileges; +set global event_scheduler = on; select user(); Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr def user() 253 141 14 N 1 31 8 diff --git a/mysql-test/t/grant_4332.test b/mysql-test/t/grant_4332.test index 4d8d769680d..f77d3be350f 100644 --- a/mysql-test/t/grant_4332.test +++ b/mysql-test/t/grant_4332.test @@ -8,8 +8,6 @@ --source include/not_embedded.inc -set global event_scheduler = on; - --enable_metadata select user(); --disable_metadata @@ -24,7 +22,10 @@ alter table mysql.columns_priv modify User char(80) binary not null default ''; alter table mysql.procs_priv modify User char(80) binary not null default ''; alter table mysql.proc modify definer char(141) collate utf8_bin not null default ''; alter table mysql.event modify definer char(141) collate utf8_bin not null default ''; -flush privileges; + +--source include/restart_mysqld.inc + +set global event_scheduler = on; --enable_metadata select user(); diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index d331c4b00ea..a7b840beb03 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -70,7 +70,7 @@ TABLE_FIELD_TYPE mysql_db_table_fields[MYSQL_DB_FIELD_COUNT] = { }, { { C_STRING_WITH_LEN("User") }, - { C_STRING_WITH_LEN("char(16)") }, + { C_STRING_WITH_LEN("char(") }, {NULL, 0} }, { |