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

Merge mysql.com:/home/jimw/my/mysql-5.0-14212

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
This commit is contained in:
jimw@mysql.com
2006-01-06 08:34:55 -08:00
parent be8f21e8f1 d07a57c03a
commit d8a4aafe33
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/handler.cc
View File

@ -1926,7 +1926,8 @@ int ha_enable_transaction(THD *thd, bool on)
is an optimization hint that storage engine is free to ignore.
So, let's commit an open transaction (if any) now.
*/
error= end_trans(thd, COMMIT);
if (!(error= ha_commit_stmt(thd)))
error= end_trans(thd, COMMIT);
}
DBUG_RETURN(error);
}