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

Merge with the latest changes in the 5.2 tree.

Browse Source
This commit is contained in:
Igor Babaev
2010-03-29 14:16:12 -07:00
parent 7e4d89c973 2c77c9ea25
commit 1a507f4ffd
387 changed files with 12736 additions and 2855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/handler.cc
View File

@@ -82,7 +82,7 @@ static plugin_ref ha_default_plugin(THD *thd)
{
if (thd->variables.table_plugin)
return thd->variables.table_plugin;
return my_plugin_lock(thd, &global_system_variables.table_plugin);
return my_plugin_lock(thd, global_system_variables.table_plugin);
}
@@ -163,13 +163,8 @@ plugin_ref ha_lock_engine(THD *thd, handlerton *hton)
{
if (hton)
{
st_plugin_int **plugin= hton2plugin + hton->slot;
#ifdef DBUG_OFF
return my_plugin_lock(thd, plugin);
#else
return my_plugin_lock(thd, &plugin);
#endif
st_plugin_int *plugin= hton2plugin[hton->slot];
return my_plugin_lock(thd, plugin_int_to_ref(plugin));
}
return NULL;
}
@@ -3115,11 +3110,14 @@ int handler::ha_check(THD *thd, HA_CHECK_OPT *check_opt)
if it is started.
*/
inline
void
handler::mark_trx_read_write()
handler::mark_trx_read_write_part2()
{
Ha_trx_info *ha_info= &ha_thd()->ha_data[ht->slot].ha_info[0];
/* Don't call this function again for this statement */
mark_trx_done= TRUE;
/*
When a storage engine method is called, the transaction must
have been started, unless it's a DDL call, for which the