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 lp:maria/5.5 to maria-5.5.37 release revision 4154.

Browse Source
This commit is contained in:
Jan Lindström
2014-04-16 12:13:43 +03:00
parent 983366e0ee 142c20eda9
commit 150e88e8c9
2006 changed files with 137005 additions and 122130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/handler.cc
View File

@ -3545,14 +3545,11 @@ int handler::ha_check(THD *thd, HA_CHECK_OPT *check_opt)
if it is started.
*/
inline
void
handler::mark_trx_read_write_part2()
handler::mark_trx_read_write()
{
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