diff options
| author | unknown <jimw@mysql.com> | 2005-07-05 15:23:13 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-07-05 15:23:13 -0700 |
| commit | 036cd1736979cf13636600f1d3804e47d9a26935 (patch) | |
| tree | 8c64e4587ea98702778dca068bd5159cdb53c5be /sql/sql_acl.cc | |
| parent | 711464a11de68abe5835a74a41f7c347a1e93b67 (diff) | |
| parent | 8218398c6ae4020c9eae9fd25ebb3a266db45035 (diff) | |
| download | mariadb-git-036cd1736979cf13636600f1d3804e47d9a26935.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/query_cache.result:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/grant.result:
Merge
mysql-test/t/grant.test:
Merge
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 c1044d31c46..a467478a012 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2035,7 +2035,8 @@ GRANT_TABLE::GRANT_TABLE(TABLE *form, TABLE *col_privs) { uint key_prefix_len; KEY_PART_INFO *key_part= col_privs->key_info->key_part; - col_privs->field[0]->store(host.hostname,(uint) strlen(host.hostname), + col_privs->field[0]->store(host.hostname, + host.hostname ? (uint) strlen(host.hostname) : 0, system_charset_info); col_privs->field[1]->store(db,(uint) strlen(db), system_charset_info); col_privs->field[2]->store(user,(uint) strlen(user), system_charset_info); |