diff options
| author | unknown <jimw@mysql.com> | 2005-07-05 12:51:16 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-07-05 12:51:16 -0700 |
| commit | 83d9aa144110ec65e537f148cd9d242d55523c46 (patch) | |
| tree | 07a18f6a8157deb459302c8c40027f21bcda93ef /sql | |
| parent | d2119109848ec7129ce5372507f36a7f339cdb1a (diff) | |
| parent | 9e78db81b04cbe271c01a384951ef2f3845027c3 (diff) | |
| download | mariadb-git-83d9aa144110ec65e537f148cd9d242d55523c46.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-11330
into mysql.com:/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'sql')
| -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 849192154da..d191da32189 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1866,7 +1866,8 @@ GRANT_TABLE::GRANT_TABLE(TABLE *form, TABLE *col_privs) if (cols) { int key_len; - 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, &my_charset_latin1); col_privs->field[1]->store(db,(uint) strlen(db), &my_charset_latin1); col_privs->field[2]->store(user,(uint) strlen(user), &my_charset_latin1); |