Commit 3f8a66cb authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)

Merged WL#2269 to mysql-5.0

parents 021f8d21 2bdd710d
This diff is collapsed.
This diff is collapsed.
...@@ -2449,14 +2449,14 @@ void Dbacc::execACC_COMMITREQ(Signal* signal) ...@@ -2449,14 +2449,14 @@ void Dbacc::execACC_COMMITREQ(Signal* signal)
operationRecPtr.p->transactionstate = IDLE; operationRecPtr.p->transactionstate = IDLE;
operationRecPtr.p->operation = ZUNDEFINED_OP; operationRecPtr.p->operation = ZUNDEFINED_OP;
if(Toperation != ZREAD){ if(Toperation != ZREAD){
rootfragrecptr.i = fragrecptr.p->myroot;
ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);
rootfragrecptr.p->m_commit_count++; rootfragrecptr.p->m_commit_count++;
if (Toperation != ZINSERT) { if (Toperation != ZINSERT) {
if (Toperation != ZDELETE) { if (Toperation != ZDELETE) {
return; return;
} else { } else {
jam(); jam();
rootfragrecptr.i = fragrecptr.p->myroot;
ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);
rootfragrecptr.p->noOfElements--; rootfragrecptr.p->noOfElements--;
fragrecptr.p->slack += operationRecPtr.p->insertDeleteLen; fragrecptr.p->slack += operationRecPtr.p->insertDeleteLen;
if (fragrecptr.p->slack > fragrecptr.p->slackCheck) { if (fragrecptr.p->slack > fragrecptr.p->slackCheck) {
...@@ -2476,8 +2476,6 @@ void Dbacc::execACC_COMMITREQ(Signal* signal) ...@@ -2476,8 +2476,6 @@ void Dbacc::execACC_COMMITREQ(Signal* signal)
}//if }//if
} else { } else {
jam(); /* EXPAND PROCESS HANDLING */ jam(); /* EXPAND PROCESS HANDLING */
rootfragrecptr.i = fragrecptr.p->myroot;
ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);
rootfragrecptr.p->noOfElements++; rootfragrecptr.p->noOfElements++;
fragrecptr.p->slack -= operationRecPtr.p->insertDeleteLen; fragrecptr.p->slack -= operationRecPtr.p->insertDeleteLen;
if (fragrecptr.p->slack >= (1u << 31)) { if (fragrecptr.p->slack >= (1u << 31)) {
......
This diff is collapsed.
...@@ -61,6 +61,7 @@ typedef struct st_ndbcluster_share { ...@@ -61,6 +61,7 @@ typedef struct st_ndbcluster_share {
pthread_mutex_t mutex; pthread_mutex_t mutex;
char *table_name; char *table_name;
uint table_name_length,use_count; uint table_name_length,use_count;
uint commit_count_lock;
ulonglong commit_count; ulonglong commit_count;
} NDB_SHARE; } NDB_SHARE;
...@@ -374,6 +375,7 @@ class Thd_ndb ...@@ -374,6 +375,7 @@ class Thd_ndb
NdbTransaction *all; NdbTransaction *all;
NdbTransaction *stmt; NdbTransaction *stmt;
int error; int error;
List<NDB_SHARE> changed_tables;
}; };
class ha_ndbcluster: public handler class ha_ndbcluster: public handler
...@@ -562,7 +564,7 @@ class ha_ndbcluster: public handler ...@@ -562,7 +564,7 @@ class ha_ndbcluster: public handler
int write_ndb_file(); int write_ndb_file();
int check_ndb_connection(); int check_ndb_connection(THD* thd= current_thd);
void set_rec_per_key(); void set_rec_per_key();
void records_update(); void records_update();
...@@ -611,6 +613,7 @@ class ha_ndbcluster: public handler ...@@ -611,6 +613,7 @@ class ha_ndbcluster: public handler
ha_rows m_rows_to_insert; ha_rows m_rows_to_insert;
ha_rows m_rows_inserted; ha_rows m_rows_inserted;
ha_rows m_bulk_insert_rows; ha_rows m_bulk_insert_rows;
ha_rows m_rows_changed;
bool m_bulk_insert_not_flushed; bool m_bulk_insert_not_flushed;
ha_rows m_ops_pending; ha_rows m_ops_pending;
bool m_skip_auto_increment; bool m_skip_auto_increment;
......
...@@ -413,7 +413,7 @@ sys_engine_condition_pushdown("engine_condition_pushdown", ...@@ -413,7 +413,7 @@ sys_engine_condition_pushdown("engine_condition_pushdown",
#ifdef HAVE_NDBCLUSTER_DB #ifdef HAVE_NDBCLUSTER_DB
/* ndb thread specific variable settings */ /* ndb thread specific variable settings */
sys_var_thd_ulong sys_var_thd_ulong
sys_ndb_autoincrement_prefetch_sz("ndb_autoincrement_prefetch_sz", sys_ndb_autoincrement_prefetch_sz("ndb_autoincrement_prefetch_sz",
&SV::ndb_autoincrement_prefetch_sz); &SV::ndb_autoincrement_prefetch_sz);
sys_var_thd_bool sys_var_thd_bool
...@@ -422,7 +422,8 @@ sys_var_thd_bool ...@@ -422,7 +422,8 @@ sys_var_thd_bool
sys_ndb_use_exact_count("ndb_use_exact_count", &SV::ndb_use_exact_count); sys_ndb_use_exact_count("ndb_use_exact_count", &SV::ndb_use_exact_count);
sys_var_thd_bool sys_var_thd_bool
sys_ndb_use_transactions("ndb_use_transactions", &SV::ndb_use_transactions); sys_ndb_use_transactions("ndb_use_transactions", &SV::ndb_use_transactions);
sys_var_long_ptr sys_ndb_cache_check_time("ndb_cache_check_time", &ndb_cache_check_time); sys_var_long_ptr
sys_ndb_cache_check_time("ndb_cache_check_time", &ndb_cache_check_time);
#endif #endif
/* Time/date/datetime formats */ /* Time/date/datetime formats */
...@@ -702,10 +703,10 @@ sys_var *sys_variables[]= ...@@ -702,10 +703,10 @@ sys_var *sys_variables[]=
&sys_engine_condition_pushdown, &sys_engine_condition_pushdown,
#ifdef HAVE_NDBCLUSTER_DB #ifdef HAVE_NDBCLUSTER_DB
&sys_ndb_autoincrement_prefetch_sz, &sys_ndb_autoincrement_prefetch_sz,
&sys_ndb_cache_check_time,
&sys_ndb_force_send, &sys_ndb_force_send,
&sys_ndb_use_exact_count, &sys_ndb_use_exact_count,
&sys_ndb_use_transactions, &sys_ndb_use_transactions,
&sys_ndb_cache_check_time,
#endif #endif
&sys_unique_checks, &sys_unique_checks,
&sys_updatable_views_with_limit, &sys_updatable_views_with_limit,
...@@ -1298,7 +1299,6 @@ static int check_max_delayed_threads(THD *thd, set_var *var) ...@@ -1298,7 +1299,6 @@ static int check_max_delayed_threads(THD *thd, set_var *var)
return 0; return 0;
} }
static void fix_max_connections(THD *thd, enum_var_type type) static void fix_max_connections(THD *thd, enum_var_type type)
{ {
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
......
...@@ -1151,7 +1151,6 @@ class THD :public ilink, ...@@ -1151,7 +1151,6 @@ class THD :public ilink,
table_map used_tables; table_map used_tables;
USER_CONN *user_connect; USER_CONN *user_connect;
CHARSET_INFO *db_charset; CHARSET_INFO *db_charset;
List<TABLE> temporary_tables_should_be_free; // list of temporary tables
/* /*
FIXME: this, and some other variables like 'count_cuted_fields' FIXME: this, and some other variables like 'count_cuted_fields'
maybe should be statement/cursor local, that is, moved to Statement maybe should be statement/cursor local, that is, moved to Statement
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment