diff options
| author | gluh@gluh.mysql.r18.ru <> | 2004-03-17 16:19:52 +0400 |
|---|---|---|
| committer | gluh@gluh.mysql.r18.ru <> | 2004-03-17 16:19:52 +0400 |
| commit | 9863b6aed9c942b1ee7c229a11318604370eaafd (patch) | |
| tree | 91523b99287b44947cf8840ca72696298734a807 /sql | |
| parent | 5868807b924cbc33567d74ead723f58512973bfa (diff) | |
| parent | 84e04c74c5f7c9dd37b66842e2929050b75ffd3c (diff) | |
| download | mariadb-git-9863b6aed9c942b1ee7c229a11318604370eaafd.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_acl.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 59a96e28d77..9284b1cd574 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3170,9 +3170,9 @@ int mysql_show_grants(THD *thd,LEX_USER *lex_user) } } } - db.append (" ON `",5); - db.append(acl_db->db); - db.append ("`.* TO '",8); + db.append (" ON ",4); + append_identifier(thd, &db, acl_db->db, strlen(acl_db->db)); + db.append (".* TO '",7); db.append(lex_user->user.str,lex_user->user.length); db.append ("'@'",3); db.append(lex_user->host.str, lex_user->host.length); @@ -3270,11 +3270,13 @@ int mysql_show_grants(THD *thd,LEX_USER *lex_user) } } } - global.append(" ON `",5); - global.append(grant_table->db); - global.append("`.`",3); - global.append(grant_table->tname); - global.append("` TO '",6); + global.append(" ON ",4); + append_identifier(thd, &global, grant_table->db, + strlen(grant_table->db)); + global.append('.'); + append_identifier(thd, &global, grant_table->tname, + strlen(grant_table->tname)); + global.append(" TO '",5); global.append(lex_user->user.str,lex_user->user.length); global.append("'@'",3); global.append(lex_user->host.str,lex_user->host.length); |