Changeset: f2fd07e420a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f2fd07e420a8
Added Files:
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_UPDATE_crash.Bug-4010.sql
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_UPDATE_crash.Bug-4010.stable.err
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_UPDATE_crash.Bug-4010.stable.out
Modified Files:
monetdb5/mal/mal_namespace.c
sql/backends/monet5/sql_decimal.mal
sql/backends/monet5/sql_decimal.mal.sh
sql/backends/monet5/sql_decimal_hge.mal
sql/backends/monet5/sql_decimal_hge.mal.sh
sql/test/BugTracker-2016/Tests/All
Branch: Jun2016
Log Message:
merged
diffs (truncated from 1796 to 300 lines):
diff --git a/monetdb5/mal/mal_namespace.c b/monetdb5/mal/mal_namespace.c
--- a/monetdb5/mal/mal_namespace.c
+++ b/monetdb5/mal/mal_namespace.c
@@ -52,17 +52,15 @@ void initNamespace(void) {
}
void mal_namespace_reset(void) {
- int i;
- NamePtr n,m;
+ struct namespace *ns;
/* assume we are at the end of the server session */
MT_lock_set(&mal_namespaceLock);
- for ( i =0; i < MAXIDENTIFIERS; i++){
- for(n = hash[i]; n; n = m){
- m = n->next;
- GDKfree(n);
- }
- hash[i] = 0;
+ memset(hash, 0, sizeof(hash));
+ while (namespace) {
+ ns = namespace->next;
+ GDKfree(namespace);
+ namespace = ns;
}
MT_lock_unset(&mal_namespaceLock);
}
diff --git a/sql/backends/monet5/sql_decimal.mal
b/sql/backends/monet5/sql_decimal.mal
--- a/sql/backends/monet5/sql_decimal.mal
+++ b/sql/backends/monet5/sql_decimal.mal
@@ -6,853 +6,853 @@
# This file was generated by using the script sql_decimal.mal.sh.
-command calc.bte( v:flt, digits:int, scale:int ) :bte
+command calc.bte(v:flt, digits:int, scale:int) :bte
address flt_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command batcalc.bte( v:bat[:flt], digits:int, scale:int ) :bat[:bte]
+command batcalc.bte(v:bat[:flt], digits:int, scale:int) :bat[:bte]
address batflt_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command calc.bte( v:dbl, digits:int, scale:int ) :bte
+command calc.bte(v:dbl, digits:int, scale:int) :bte
address dbl_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command batcalc.bte( v:bat[:dbl], digits:int, scale:int ) :bat[:bte]
+command batcalc.bte(v:bat[:dbl], digits:int, scale:int) :bat[:bte]
address batdbl_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command calc.sht( v:flt, digits:int, scale:int ) :sht
+command calc.sht(v:flt, digits:int, scale:int) :sht
address flt_num2dec_sht
comment "cast number to decimal(sht) and check for overflow";
-command batcalc.sht( v:bat[:flt], digits:int, scale:int ) :bat[:sht]
+command batcalc.sht(v:bat[:flt], digits:int, scale:int) :bat[:sht]
address batflt_num2dec_sht
comment "cast number to decimal(sht) and check for overflow";
-command calc.sht( v:dbl, digits:int, scale:int ) :sht
+command calc.sht(v:dbl, digits:int, scale:int) :sht
address dbl_num2dec_sht
comment "cast number to decimal(sht) and check for overflow";
-command batcalc.sht( v:bat[:dbl], digits:int, scale:int ) :bat[:sht]
+command batcalc.sht(v:bat[:dbl], digits:int, scale:int) :bat[:sht]
address batdbl_num2dec_sht
comment "cast number to decimal(sht) and check for overflow";
-command calc.int( v:flt, digits:int, scale:int ) :int
+command calc.int(v:flt, digits:int, scale:int) :int
address flt_num2dec_int
comment "cast number to decimal(int) and check for overflow";
-command batcalc.int( v:bat[:flt], digits:int, scale:int ) :bat[:int]
+command batcalc.int(v:bat[:flt], digits:int, scale:int) :bat[:int]
address batflt_num2dec_int
comment "cast number to decimal(int) and check for overflow";
-command calc.int( v:dbl, digits:int, scale:int ) :int
+command calc.int(v:dbl, digits:int, scale:int) :int
address dbl_num2dec_int
comment "cast number to decimal(int) and check for overflow";
-command batcalc.int( v:bat[:dbl], digits:int, scale:int ) :bat[:int]
+command batcalc.int(v:bat[:dbl], digits:int, scale:int) :bat[:int]
address batdbl_num2dec_int
comment "cast number to decimal(int) and check for overflow";
-command calc.wrd( v:flt, digits:int, scale:int ) :wrd
+command calc.wrd(v:flt, digits:int, scale:int) :wrd
address flt_num2dec_wrd
comment "cast number to decimal(wrd) and check for overflow";
-command batcalc.wrd( v:bat[:flt], digits:int, scale:int ) :bat[:wrd]
+command batcalc.wrd(v:bat[:flt], digits:int, scale:int) :bat[:wrd]
address batflt_num2dec_wrd
comment "cast number to decimal(wrd) and check for overflow";
-command calc.wrd( v:dbl, digits:int, scale:int ) :wrd
+command calc.wrd(v:dbl, digits:int, scale:int) :wrd
address dbl_num2dec_wrd
comment "cast number to decimal(wrd) and check for overflow";
-command batcalc.wrd( v:bat[:dbl], digits:int, scale:int ) :bat[:wrd]
+command batcalc.wrd(v:bat[:dbl], digits:int, scale:int) :bat[:wrd]
address batdbl_num2dec_wrd
comment "cast number to decimal(wrd) and check for overflow";
-command calc.lng( v:flt, digits:int, scale:int ) :lng
+command calc.lng(v:flt, digits:int, scale:int) :lng
address flt_num2dec_lng
comment "cast number to decimal(lng) and check for overflow";
-command batcalc.lng( v:bat[:flt], digits:int, scale:int ) :bat[:lng]
+command batcalc.lng(v:bat[:flt], digits:int, scale:int) :bat[:lng]
address batflt_num2dec_lng
comment "cast number to decimal(lng) and check for overflow";
-command calc.lng( v:dbl, digits:int, scale:int ) :lng
+command calc.lng(v:dbl, digits:int, scale:int) :lng
address dbl_num2dec_lng
comment "cast number to decimal(lng) and check for overflow";
-command batcalc.lng( v:bat[:dbl], digits:int, scale:int ) :bat[:lng]
+command batcalc.lng(v:bat[:dbl], digits:int, scale:int) :bat[:lng]
address batdbl_num2dec_lng
comment "cast number to decimal(lng) and check for overflow";
-command calc.bte( v:bte, digits:int, scale:int ) :bte
+command calc.bte(v:bte, digits:int, scale:int) :bte
address bte_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command batcalc.bte( v:bat[:bte], digits:int, scale:int ) :bat[:bte]
+command batcalc.bte(v:bat[:bte], digits:int, scale:int) :bat[:bte]
address batbte_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command calc.bte( s1:int, v:bte) :bte
+command calc.bte(s1:int, v:bte) :bte
address bte_dec2_bte
comment "cast decimal(bte) to bte and check for overflow";
-command calc.bte( s1:int, v:bte, d2:int, s2:int ) :bte
+command calc.bte(s1:int, v:bte, d2:int, s2:int) :bte
address bte_dec2dec_bte
comment "cast decimal(bte) to decimal(bte) and check for overflow";
-command batcalc.bte( s1:int, v:bat[:bte]) :bat[:bte]
+command batcalc.bte(s1:int, v:bat[:bte]) :bat[:bte]
address batbte_dec2_bte
comment "cast decimal(bte) to bte and check for overflow";
-command batcalc.bte( s1:int, v:bat[:bte], d2:int, s2:int ) :bat[:bte]
+command batcalc.bte(s1:int, v:bat[:bte], d2:int, s2:int) :bat[:bte]
address batbte_dec2dec_bte
comment "cast decimal(bte) to decimal(bte) and check for overflow";
-command calc.bte( v:sht, digits:int, scale:int ) :bte
+command calc.bte(v:sht, digits:int, scale:int) :bte
address sht_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command batcalc.bte( v:bat[:sht], digits:int, scale:int ) :bat[:bte]
+command batcalc.bte(v:bat[:sht], digits:int, scale:int) :bat[:bte]
address batsht_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command calc.bte( s1:int, v:sht) :bte
+command calc.bte(s1:int, v:sht) :bte
address sht_dec2_bte
comment "cast decimal(sht) to bte and check for overflow";
-command calc.bte( s1:int, v:sht, d2:int, s2:int ) :bte
+command calc.bte(s1:int, v:sht, d2:int, s2:int) :bte
address sht_dec2dec_bte
comment "cast decimal(sht) to decimal(bte) and check for overflow";
-command batcalc.bte( s1:int, v:bat[:sht]) :bat[:bte]
+command batcalc.bte(s1:int, v:bat[:sht]) :bat[:bte]
address batsht_dec2_bte
comment "cast decimal(sht) to bte and check for overflow";
-command batcalc.bte( s1:int, v:bat[:sht], d2:int, s2:int ) :bat[:bte]
+command batcalc.bte(s1:int, v:bat[:sht], d2:int, s2:int) :bat[:bte]
address batsht_dec2dec_bte
comment "cast decimal(sht) to decimal(bte) and check for overflow";
-command calc.bte( v:int, digits:int, scale:int ) :bte
+command calc.bte(v:int, digits:int, scale:int) :bte
address int_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command batcalc.bte( v:bat[:int], digits:int, scale:int ) :bat[:bte]
+command batcalc.bte(v:bat[:int], digits:int, scale:int) :bat[:bte]
address batint_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command calc.bte( s1:int, v:int) :bte
+command calc.bte(s1:int, v:int) :bte
address int_dec2_bte
comment "cast decimal(int) to bte and check for overflow";
-command calc.bte( s1:int, v:int, d2:int, s2:int ) :bte
+command calc.bte(s1:int, v:int, d2:int, s2:int) :bte
address int_dec2dec_bte
comment "cast decimal(int) to decimal(bte) and check for overflow";
-command batcalc.bte( s1:int, v:bat[:int]) :bat[:bte]
+command batcalc.bte(s1:int, v:bat[:int]) :bat[:bte]
address batint_dec2_bte
comment "cast decimal(int) to bte and check for overflow";
-command batcalc.bte( s1:int, v:bat[:int], d2:int, s2:int ) :bat[:bte]
+command batcalc.bte(s1:int, v:bat[:int], d2:int, s2:int) :bat[:bte]
address batint_dec2dec_bte
comment "cast decimal(int) to decimal(bte) and check for overflow";
-command calc.bte( v:wrd, digits:int, scale:int ) :bte
+command calc.bte(v:wrd, digits:int, scale:int) :bte
address wrd_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command batcalc.bte( v:bat[:wrd], digits:int, scale:int ) :bat[:bte]
+command batcalc.bte(v:bat[:wrd], digits:int, scale:int) :bat[:bte]
address batwrd_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command calc.bte( s1:int, v:wrd) :bte
+command calc.bte(s1:int, v:wrd) :bte
address wrd_dec2_bte
comment "cast decimal(wrd) to bte and check for overflow";
-command calc.bte( s1:int, v:wrd, d2:int, s2:int ) :bte
+command calc.bte(s1:int, v:wrd, d2:int, s2:int) :bte
address wrd_dec2dec_bte
comment "cast decimal(wrd) to decimal(bte) and check for overflow";
-command batcalc.bte( s1:int, v:bat[:wrd]) :bat[:bte]
+command batcalc.bte(s1:int, v:bat[:wrd]) :bat[:bte]
address batwrd_dec2_bte
comment "cast decimal(wrd) to bte and check for overflow";
-command batcalc.bte( s1:int, v:bat[:wrd], d2:int, s2:int ) :bat[:bte]
+command batcalc.bte(s1:int, v:bat[:wrd], d2:int, s2:int) :bat[:bte]
address batwrd_dec2dec_bte
comment "cast decimal(wrd) to decimal(bte) and check for overflow";
-command calc.bte( v:lng, digits:int, scale:int ) :bte
+command calc.bte(v:lng, digits:int, scale:int) :bte
address lng_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command batcalc.bte( v:bat[:lng], digits:int, scale:int ) :bat[:bte]
+command batcalc.bte(v:bat[:lng], digits:int, scale:int) :bat[:bte]
address batlng_num2dec_bte
comment "cast number to decimal(bte) and check for overflow";
-command calc.bte( s1:int, v:lng) :bte
+command calc.bte(s1:int, v:lng) :bte
address lng_dec2_bte
comment "cast decimal(lng) to bte and check for overflow";
-command calc.bte( s1:int, v:lng, d2:int, s2:int ) :bte
+command calc.bte(s1:int, v:lng, d2:int, s2:int) :bte
address lng_dec2dec_bte
comment "cast decimal(lng) to decimal(bte) and check for overflow";
-command batcalc.bte( s1:int, v:bat[:lng]) :bat[:bte]
+command batcalc.bte(s1:int, v:bat[:lng]) :bat[:bte]
address batlng_dec2_bte
comment "cast decimal(lng) to bte and check for overflow";
-command batcalc.bte( s1:int, v:bat[:lng], d2:int, s2:int ) :bat[:bte]
+command batcalc.bte(s1:int, v:bat[:lng], d2:int, s2:int) :bat[:bte]
address batlng_dec2dec_bte
comment "cast decimal(lng) to decimal(bte) and check for overflow";
-command calc.sht( v:bte, digits:int, scale:int ) :sht
+command calc.sht(v:bte, digits:int, scale:int) :sht
address bte_num2dec_sht
comment "cast number to decimal(sht) and check for overflow";
-command batcalc.sht( v:bat[:bte], digits:int, scale:int ) :bat[:sht]
+command batcalc.sht(v:bat[:bte], digits:int, scale:int) :bat[:sht]
address batbte_num2dec_sht
comment "cast number to decimal(sht) and check for overflow";
-command calc.sht( s1:int, v:bte) :sht
+command calc.sht(s1:int, v:bte) :sht
address bte_dec2_sht
comment "cast decimal(bte) to sht and check for overflow";
-command calc.sht( s1:int, v:bte, d2:int, s2:int ) :sht
+command calc.sht(s1:int, v:bte, d2:int, s2:int) :sht
address bte_dec2dec_sht
comment "cast decimal(bte) to decimal(sht) and check for overflow";
-command batcalc.sht( s1:int, v:bat[:bte]) :bat[:sht]
+command batcalc.sht(s1:int, v:bat[:bte]) :bat[:sht]
address batbte_dec2_sht
comment "cast decimal(bte) to sht and check for overflow";
-command batcalc.sht( s1:int, v:bat[:bte], d2:int, s2:int ) :bat[:sht]
+command batcalc.sht(s1:int, v:bat[:bte], d2:int, s2:int) :bat[:sht]
address batbte_dec2dec_sht
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
