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

Automerge

Browse Source 
sql/sql_parse.cc:
  Auto merged
sql/handler.cc:
  SCCS merged
sql/mysql_priv.h:
  SCCS merged
This commit is contained in:
unknown
2005-03-17 10:06:49 +01:00
parent 5c1b91f1ee 1f91905231
commit 2b466294e3
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/handler.cc
View File

@ -526,7 +526,6 @@ void trans_register_ha(THD *thd, bool all, handlerton *ht_arg)
/*
RETURN
-1 - cannot prepare
0 - ok
1 - error, transaction was rolled back
*/
@ -539,8 +538,6 @@ int ha_prepare(THD *thd)
#ifdef USING_TRANSACTIONS
if (trans->nht)
{
if (trans->no_2pc)
DBUG_RETURN(-1);
for (; *ht; ht++)
{
int err;