1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix to make transaction failure also affect select count() on other tables in thread

Browse Source
This commit is contained in:
unknown 2004-09-14 16:17:01 +00:00
parent 0deb4c4192
commit 6829605c4a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sql/ha_ndbcluster.cc
View File

@ -147,6 +147,7 @@ Thd_ndb::Thd_ndb()
ndb= new Ndb(g_ndb_cluster_connection, "");
lock_count= 0;
count= 0;
error= 0;
}
Thd_ndb::~Thd_ndb()
@ -179,6 +180,11 @@ void ha_ndbcluster::records_update()
info->records= rows;
}
}
{
THD *thd= current_thd;
if (((Thd_ndb*)(thd->transaction.thd_ndb))->error)
info->no_uncommitted_rows_count= 0;
}
records= info->records+ info->no_uncommitted_rows_count;
DBUG_VOID_RETURN;
}
@ -186,8 +192,8 @@ void ha_ndbcluster::records_update()
void ha_ndbcluster::no_uncommitted_rows_execute_failure()
{
DBUG_ENTER("ha_ndbcluster::no_uncommitted_rows_execute_failure");
struct Ndb_table_local_info *info= (struct Ndb_table_local_info *)m_table_info;
info->no_uncommitted_rows_count= 0;
THD *thd= current_thd;
((Thd_ndb*)(thd->transaction.thd_ndb))->error= 1;
DBUG_VOID_RETURN;
}
@ -223,6 +229,7 @@ void ha_ndbcluster::no_uncommitted_rows_reset(THD *thd)
{
DBUG_ENTER("ha_ndbcluster::no_uncommitted_rows_reset");
((Thd_ndb*)(thd->transaction.thd_ndb))->count++;
((Thd_ndb*)(thd->transaction.thd_ndb))->error= 0;
DBUG_VOID_RETURN;
}

1
sql/ha_ndbcluster.h
View File

@ -74,6 +74,7 @@ class Thd_ndb {
Ndb *ndb;
ulong count;
uint lock_count;
int error;
};
class ha_ndbcluster: public handler