diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-07-18 04:04:24 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-07-18 04:04:24 +0300 |
| commit | 06517dfed3505981105d892e036e36d32c23c9aa (patch) | |
| tree | 6daa5670b9fcf6d6a667f2f4af5a9ac7e1d44770 /sql/sql_acl.cc | |
| parent | 6159cd27bfe9d24e610c7a25f8e0d991abd9caff (diff) | |
| download | mariadb-git-06517dfed3505981105d892e036e36d32c23c9aa.tar.gz | |
Fixed memory overrun when doing REPAIR on table with multi-part auto_increment key where one part was a packed CHAR
myisam/mi_check.c:
Fixed memory overrun in _mi_put_key_in_record
myisam/mi_key.c:
Fixed unnecessary memory allocation
mysql-test/r/insert_select.result:
Added test case for memory corruption
mysql-test/t/insert_select.test:
Added test case for memory corruption
mysys/safemalloc.c:
Removed compiler warnings
sql/sql_acl.cc:
Fixed core dump when running with --debug
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 697b5d8ffd6..d773aa5bc71 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1136,7 +1136,11 @@ find_acl_user(const char *host, const char *user) { ACL_USER *acl_user=dynamic_element(&acl_users,i,ACL_USER*); DBUG_PRINT("info",("strcmp('%s','%s'), compare_hostname('%s','%s'),", - user,acl_user->user,(host),(acl_user->host))); + user, + acl_user->user ? acl_user->user : "", + host, + acl_user->host.hostname ? acl_user->host.hostname : + "")); if (!acl_user->user && !user[0] || acl_user->user && !strcmp(user,acl_user->user)) { |