Update of /cvsroot/monetdb/sql/src/storage
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24178/src/storage
Modified Files:
Tag: Aug2009
sql_storage.h store.mx
Log Message:
fixed bug, ie handle 0.0 correctly as a decimal(1,0)
fixed bug, ie decimal(d,s) d < 19 and s < d (not d+s < 19)
make sure we flush all inserts to disk when we restart the log
U store.mx
Index: store.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/store.mx,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -u -d -r1.33 -r1.33.2.1
--- store.mx 26 Jul 2009 09:13:33 -0000 1.33
+++ store.mx 4 Aug 2009 22:15:24 -0000 1.33.2.1
@@ -1447,6 +1447,8 @@
logging = 1;
/* make sure we reset all transactions on re-activation */
schema_number++;
+ if (store_funcs.gtrans_update)
+ store_funcs.gtrans_update(gtrans);
res = logger_funcs.restart();
MT_unset_lock(bs_lock, "store_manager");
if (logging && res == LOG_OK)
@@ -4231,8 +4233,11 @@
int snr = tr->schema_number;
if (tr->stime < gtrans->stime || tr->wtime ||
- store_schema_number() != snr)
+ store_schema_number() != snr) {
+ if (tr->wtime)
+ snr = 0;
reset_trans(tr, gtrans);
+ }
tr = trans_init(tr, tr->stk, tr->parent);
s->active = 1;
s->schema = find_sql_schema(tr, s->schema_name);
U sql_storage.h
Index: sql_storage.h
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/sql_storage.h,v
retrieving revision 1.57
retrieving revision 1.57.2.1
diff -u -d -r1.57 -r1.57.2.1
--- sql_storage.h 25 Jul 2009 22:08:38 -0000 1.57
+++ sql_storage.h 4 Aug 2009 22:15:24 -0000 1.57.2.1
@@ -150,6 +150,11 @@
*/
typedef int (*update_table_fptr) (sql_trans *tr, sql_table *ft, sql_table
*tt);
+/*
+-- gtrans_update push ibats and ubats
+-- returns LOG_OK, LOG_ERR
+*/
+typedef int (*gtrans_update_fptr) (sql_trans *tr);
/*
-- handle inserts and updates of columns and indices
@@ -220,6 +225,7 @@
update_table_fptr snapshot_table;
update_table_fptr log_table;
update_table_fptr update_table;
+ gtrans_update_fptr gtrans_update;
col_ins_fptr col_ins;
col_upd_fptr col_upd;
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
