database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

manual merge

Browse Source 
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2004-07-20 15:34:57 +02:00
parent 3f5e1ba9ea 26821ee3f5
commit e2d25910f8
48 changed files with 416 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_db.cc
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);
}