Changeset: 4f8c1d566c22 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4f8c1d566c22
Modified Files:
        sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql
        sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err
        sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
Branch: Jul2015
Log Message:

Merge with Oct2014 branch.


diffs (75 lines):

diff --git a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql 
b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql
--- a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql
+++ b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql
@@ -105,10 +105,10 @@ INSERT INTO "bidder" ("id", "open_auctio
 (59, 'open_auction11', '05/08/2000', '06:44:20', 'person3', 4.5),
 (60, 'open_auction11', '10/22/2001', '15:34:49', 'person4', 15);
 
-Select b.* FROM open_auctions o, b bidder WHERE (select b3.INCREASE from 
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where 
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from 
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where 
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id = 
b.open_auction_id;
+Select b.* FROM open_auctions o, b bidder WHERE (select b3.INCREASE from 
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where 
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from 
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where 
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id = 
b.open_auction_id order by date, time;
 
 plan Select b.* FROM open_auctions o, bidder b WHERE (select b3.INCREASE from 
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where 
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from 
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where 
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id = 
b.open_auction_id;
-Select b.* FROM open_auctions o, bidder b WHERE (select b3.INCREASE from 
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where 
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from 
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where 
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id = 
b.open_auction_id;
+Select b.* FROM open_auctions o, bidder b WHERE (select b3.INCREASE from 
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where 
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from 
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where 
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id = 
b.open_auction_id order by date, time;
 
 drop table bidder;
 drop table open_auctions;
diff --git a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err 
b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err
--- a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err
+++ b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err
@@ -30,8 +30,8 @@ stderr of test 'crash.Bug-3736` in direc
 # 10:50:37 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-30636" "--port=38510"
 # 10:50:37 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-30636/.s.monetdb.38510
-QUERY = Select b.* FROM open_auctions o, b bidder WHERE (select b3.INCREASE 
from bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where 
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from 
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where 
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id = 
b.open_auction_id;
+MAPI  = (monetdb) /var/tmp/mtest-6362/.s.monetdb.36855
+QUERY = Select b.* FROM open_auctions o, b bidder WHERE (select b3.INCREASE 
from bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where 
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from 
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where 
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id = 
b.open_auction_id order by date, time;
 ERROR = !SELECT: no such table 'b'
 
 # 10:50:38 >  
diff --git a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out 
b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
--- a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
+++ b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
@@ -96,15 +96,15 @@ project (
 | | | | | | | | | | | | | ) [  ]
 | | | | | | | | | | | | ) [ L10.L10 HASHCOL , o.id NOT NULL HASHCOL , 
o.open_auction_id NOT NULL, b.id NOT NULL HASHCOL , b.open_auction_id NOT NULL, 
b.date NOT NULL, b.time NOT NULL, b.personref NOT NULL, b.increase NOT NULL, 
b3.id NOT NULL HASHCOL , b3.increase NOT NULL, sys.identity(o.id NOT NULL 
HASHCOL ) HASHCOL  as L7.L7 ]
 | | | | | | | | | | | ) [ b3a.open_auction_id NOT NULL = o.open_auction_id NOT 
NULL ]
-| | | | | | | | | | ) [ L10.L10, L7.L7 ] [ L10.L10 HASHCOL , o.id NOT NULL 
HASHCOL , o.open_auction_id NOT NULL, b.id NOT NULL HASHCOL , b.open_auction_id 
NOT NULL, b.date NOT NULL, b.time NOT NULL, b.personref NOT NULL, b.increase 
NOT NULL, b3.id NOT NULL HASHCOL , b3.increase NOT NULL, L7.L7 HASHCOL , 
sys.min no nil (b3a.id NOT NULL HASHCOL ) NOT NULL as L1.L1 ]
+| | | | | | | | | | ) [ L7.L7, L10.L10 ] [ L10.L10 HASHCOL , o.id NOT NULL 
HASHCOL , o.open_auction_id NOT NULL, b.id NOT NULL HASHCOL , b.open_auction_id 
NOT NULL, b.date NOT NULL, b.time NOT NULL, b.personref NOT NULL, b.increase 
NOT NULL, b3.id NOT NULL HASHCOL , b3.increase NOT NULL, L7.L7 HASHCOL , 
sys.min no nil (b3a.id NOT NULL HASHCOL ) NOT NULL as L1.L1 ]
 | | | | | | | | | ) [ b3.id NOT NULL HASHCOL  = L1 NOT NULL ]
 | | | | | | | | ) [ o.id NOT NULL HASHCOL , o.open_auction_id NOT NULL, b.id 
NOT NULL HASHCOL , b.open_auction_id NOT NULL, b.date NOT NULL, b.time NOT 
NULL, b.personref NOT NULL, b.increase NOT NULL, b3.increase NOT NULL as L2.L2, 
sys.identity(o.id NOT NULL HASHCOL ) HASHCOL  as L12.L12 ]
 | | | | | | | ) [  ]
 | | | | | | ) [ L2.L2 NOT NULL, L12.L12 HASHCOL , o.id NOT NULL HASHCOL , 
o.open_auction_id NOT NULL, b.id NOT NULL HASHCOL , b.open_auction_id NOT NULL, 
b.date NOT NULL, b.time NOT NULL, b.personref NOT NULL, b.increase NOT NULL, 
L5.id NOT NULL, L5.increase NOT NULL, sys.identity(o.id NOT NULL HASHCOL ) 
HASHCOL  as L11.L11 ]
 | | | | | ) [ L6.open_auction_id NOT NULL = o.open_auction_id NOT NULL ]
-| | | | ) [ L12.L12, L11.L11 ] [ L2.L2 NOT NULL, L12.L12 HASHCOL , b.id NOT 
NULL HASHCOL , b.open_auction_id NOT NULL, b.date NOT NULL, b.time NOT NULL, 
b.personref NOT NULL, b.increase NOT NULL, L5.id NOT NULL, L5.increase NOT 
NULL, L11.L11 HASHCOL , sys.max no nil (L6.id NOT NULL HASHCOL  as b2a.id) NOT 
NULL as L3.L3 ]
+| | | | ) [ L11.L11, L12.L12 ] [ L2.L2 NOT NULL, L12.L12 HASHCOL , b.id NOT 
NULL HASHCOL , b.open_auction_id NOT NULL, b.date NOT NULL, b.time NOT NULL, 
b.personref NOT NULL, b.increase NOT NULL, L5.id NOT NULL, L5.increase NOT 
NULL, L11.L11 HASHCOL , sys.max no nil (L6.id NOT NULL HASHCOL  as b2a.id) NOT 
NULL as L3.L3 ]
 | | | ) [ L5.id NOT NULL = L3.L3 NOT NULL ]
-| | ) [ L2.L2 NOT NULL, L12.L12 HASHCOL , b.id NOT NULL HASHCOL , 
b.open_auction_id NOT NULL, b.date NOT NULL, b.time NOT NULL, b.personref NOT 
NULL, b.increase NOT NULL, L5.id NOT NULL, L5.increase NOT NULL, L11.L11 
HASHCOL , L3.L3 NOT NULL, sys.sql_mul(L2.L2 NOT NULL, double[tinyint "2"]) as 
L13.L13, L5.increase NOT NULL as L14.L14 ]
+| | ) [ L2.L2 NOT NULL, L12.L12 HASHCOL , b.id NOT NULL HASHCOL , 
b.open_auction_id NOT NULL, b.date NOT NULL, b.time NOT NULL, b.personref NOT 
NULL, b.increase NOT NULL, L5.id NOT NULL, L5.increase NOT NULL, L11.L11 
HASHCOL , L3.L3 NOT NULL, sys.sql_mul(L2.L2 NOT NULL, double "2.000000") as 
L13.L13, L5.increase NOT NULL as L14.L14 ]
 | ) [ L13.L13 <= L14.L14 NOT NULL ]
 ) [ b.id NOT NULL HASHCOL , b.open_auction_id NOT NULL, b.date NOT NULL, 
b.time NOT NULL, b.personref NOT NULL, b.increase NOT NULL ]
 #Select b.* FROM open_auctions o, bidder b WHERE (select b3.INCREASE from 
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where 
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from 
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where 
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id = 
b.open_auction_id;
@@ -112,16 +112,16 @@ project (
 % id,  open_auction_id,        date,   time,   personref,      increase # name
 % int, varchar,        varchar,        varchar,        varchar,        double 
# type
 % 2,   13,     10,     8,      8,      24 # length
-[ 5,   "open_auction1",        "11/12/1998",   "11:23:38",     "person20",     
4.5     ]
-[ 6,   "open_auction1",        "10/02/2000",   "22:48:00",     "person4",      
15      ]
-[ 7,   "open_auction1",        "12/04/1998",   "22:29:38",     "person23",     
1.5     ]
+[ 11,  "open_auction1",        "05/21/2001",   "08:02:16",     "person5",      
12      ]
 [ 8,   "open_auction1",        "06/22/1999",   "12:43:47",     "person19",     
15      ]
-[ 9,   "open_auction1",        "12/02/2001",   "13:38:51",     "person15",     
45      ]
-[ 10,  "open_auction1",        "11/12/2001",   "04:50:27",     "person9",      
6       ]
-[ 11,  "open_auction1",        "05/21/2001",   "08:02:16",     "person5",      
12      ]
 [ 29,  "open_auction5",        "07/07/2000",   "08:53:00",     "person15",     
6       ]
 [ 30,  "open_auction5",        "08/06/2001",   "10:16:15",     "person13",     
4.5     ]
 [ 31,  "open_auction5",        "08/23/1999",   "08:26:06",     "person17",     
30      ]
+[ 6,   "open_auction1",        "10/02/2000",   "22:48:00",     "person4",      
15      ]
+[ 5,   "open_auction1",        "11/12/1998",   "11:23:38",     "person20",     
4.5     ]
+[ 10,  "open_auction1",        "11/12/2001",   "04:50:27",     "person9",      
6       ]
+[ 9,   "open_auction1",        "12/02/2001",   "13:38:51",     "person15",     
45      ]
+[ 7,   "open_auction1",        "12/04/1998",   "22:29:38",     "person23",     
1.5     ]
 #drop table bidder;
 #drop table open_auctions;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to