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

Fix to remove engine dependency from handler.cc file, the last one for functions.

Browse Source
This commit is contained in:
brian@zim.(none)
2006-03-26 01:32:52 -08:00
parent ec4910c413
commit f940472d5a
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/ha_innodb.cc
View File

@ -237,7 +237,8 @@ handlerton innobase_hton = {
NULL, /* Fill FILES table */ NULL, /* Fill FILES table */
HTON_NO_FLAGS, HTON_NO_FLAGS,
NULL, /* binlog_func */ NULL, /* binlog_func */
NULL /* binlog_log_query */ NULL, /* binlog_log_query */
innobase_release_temporary_latches
}; };

20
sql/handler.cc
View File

@ -1179,11 +1179,23 @@ bool mysql_xa_recover(THD *thd)
return value: always 0 return value: always 0
*/ */
static my_bool release_temporary_latches(THD *thd, st_plugin_int *plugin,
void *unused)
{
handlerton *hton= (handlerton *) plugin->plugin->info;
if (hton->state == SHOW_OPTION_YES && hton->release_temporary_latches)
hton->release_temporary_latches(thd);
return FALSE;
}
int ha_release_temporary_latches(THD *thd) int ha_release_temporary_latches(THD *thd)
{ {
#ifdef WITH_INNOBASE_STORAGE_ENGINE plugin_foreach(thd, release_temporary_latches, MYSQL_STORAGE_ENGINE_PLUGIN,
innobase_release_temporary_latches(thd); NULL);
#endif
return 0; return 0;
} }
@ -3264,6 +3276,8 @@ int handler::ha_external_lock(THD *thd, int lock_type)
case SQLCOM_TRUNCATE: case SQLCOM_TRUNCATE:
case SQLCOM_ALTER_TABLE: case SQLCOM_ALTER_TABLE:
DBUG_RETURN(0); DBUG_RETURN(0);
default:
break;
} }
/* /*

1
sql/handler.h
View File

@ -580,6 +580,7 @@ typedef struct
void (*binlog_log_query)(THD *thd, enum_binlog_command binlog_command, void (*binlog_log_query)(THD *thd, enum_binlog_command binlog_command,
const char *query, uint query_length, const char *query, uint query_length,
const char *db, const char *table_name); const char *db, const char *table_name);
int (*release_temporary_latches)(THD *thd);
} handlerton; } handlerton;
extern const handlerton default_hton; extern const handlerton default_hton;