diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-09-28 20:43:56 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-09-28 20:43:56 -0400 |
| commit | c916085e271cd049537b1e07b36cd060c44750bd (patch) | |
| tree | 337ddfcd033174143cf9bd08e6ba50174459d7ff /sql/sql_acl.cc | |
| parent | 023366e6eb68edca3858c32e7492788e047d927a (diff) | |
| parent | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (diff) | |
| download | mariadb-git-c916085e271cd049537b1e07b36cd060c44750bd.tar.gz | |
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index c980c435c79..a67828ac680 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -7590,7 +7590,7 @@ bool mysql_show_grants(THD *thd, LEX_USER *lex_user) } DBUG_ASSERT(rolename || username); - Item_string *field=new Item_string("",0,&my_charset_latin1); + Item_string *field=new Item_string_ascii("", 0); List<Item> field_list; field->name=buff; field->max_length=1024; @@ -8907,6 +8907,7 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop, acl_user->user.str= strdup_root(&acl_memroot, user_to->user.str); acl_user->user.length= user_to->user.length; acl_user->host.hostname= strdup_root(&acl_memroot, user_to->host.str); + acl_user->hostname_length= user_to->host.length; break; case DB_ACL: |