mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
manual merge
This commit is contained in:
@@ -225,7 +225,8 @@ void del_dbopt(const char *path)
|
||||
{
|
||||
my_dbopt_t *opt;
|
||||
rw_wrlock(&LOCK_dboptions);
|
||||
if ((opt= (my_dbopt_t *)hash_search(&dboptions, (byte*) path, strlen(path))))
|
||||
if ((opt= (my_dbopt_t *)hash_search(&dboptions, (const byte*) path,
|
||||
strlen(path))))
|
||||
hash_delete(&dboptions, (byte*) opt);
|
||||
rw_unlock(&LOCK_dboptions);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user