diff options
| author | monty@mysql.com <> | 2003-12-12 22:26:58 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-12-12 22:26:58 +0200 |
| commit | f995a5f4aa919d6d229d29fb652a263d8c816430 (patch) | |
| tree | 771f288d33d415cb8e3d292f33e46fdb512d9dff /sql/sql_acl.cc | |
| parent | fddab846d4f3658b3488cbec43c7d16f07f14594 (diff) | |
| download | mariadb-git-f995a5f4aa919d6d229d29fb652a263d8c816430.tar.gz | |
Fix autoincrement for signed columns (Bug #1366)
Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651)
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711)
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
Fixed timestamp.test
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 03a359d44e7..a395396be2d 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1202,11 +1202,11 @@ static const char *calc_ip(const char *ip, long *val, char end) static void update_hostname(acl_host_and_ip *host, const char *hostname) { host->hostname=(char*) hostname; // This will not be modified! - if (hostname && + if (!hostname || (!(hostname=calc_ip(hostname,&host->ip,'/')) || !(hostname=calc_ip(hostname+1,&host->ip_mask,'\0')))) { - host->ip=host->ip_mask=0; // Not a masked ip + host->ip= host->ip_mask=0; // Not a masked ip } } |