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 xiphis.org:/home/antony/work2/mysql-5.1

Browse Source 
into  xiphis.org:/home/antony/work3/mysql-5.1-plugable-2
This commit is contained in:
acurtis@xiphis.org
2005-12-21 10:26:39 -08:00
parent bb1b1a28a6 13a776778c
commit 9d4d1e81b8
54 changed files with 1507 additions and 702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_cache.cc
View File

@ -2243,7 +2243,7 @@ Query_cache::register_tables_from_list(TABLE_LIST *tables_used,
tables_used->engine_data))
DBUG_RETURN(0);
if (tables_used->table->s->db_type == DB_TYPE_MRG_MYISAM)
if (tables_used->table->s->db_type == &myisammrg_hton)
{
ha_myisammrg *handler = (ha_myisammrg *) tables_used->table->file;
MYRG_INFO *file = handler->myrg_info();
@ -2871,7 +2871,7 @@ static TABLE_COUNTER_TYPE process_and_count_tables(TABLE_LIST *tables_used,
"other non-cacheable table(s)"));
DBUG_RETURN(0);
}
if (tables_used->table->s->db_type == DB_TYPE_MRG_MYISAM)
if (tables_used->table->s->db_type == &myisammrg_hton)
{
ha_myisammrg *handler = (ha_myisammrg *)tables_used->table->file;
MYRG_INFO *file = handler->myrg_info();