1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

manual merge

This commit is contained in:
serg@serg.mylan
2004-07-20 15:34:57 +02:00
48 changed files with 416 additions and 186 deletions

View File

@ -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);
}