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

Merge from 4.1

Browse Source 
Archive fix by Ingo.
Innodb compile fix by Monty.
This commit is contained in:
ingo@mysql.com
2005-01-26 15:51:46 +01:00
parent be5dade853 300337cee7
commit bbcd542917
8 changed files with 74 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/handler.cc
View File

@ -372,6 +372,16 @@ int ha_init()
else
opt_using_transactions=1;
}
#endif
#ifdef HAVE_ARCHIVE_DB
if (have_archive_db == SHOW_OPTION_YES)
{
if (archive_db_init())
{
have_archive_db= SHOW_OPTION_DISABLED;
error= 1;
}
}
#endif
return error;
}
@ -403,6 +413,10 @@ int ha_panic(enum ha_panic_function flag)
#ifdef HAVE_NDBCLUSTER_DB
if (have_ndbcluster == SHOW_OPTION_YES)
error|=ndbcluster_end();
#endif
#ifdef HAVE_ARCHIVE_DB
if (have_archive_db == SHOW_OPTION_YES)
error|= archive_db_end();
#endif
if (ha_finish_errors())
error= 1;