Changeset: aef2a98d802b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aef2a98d802b
Modified Files:
        
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (18 lines):

diff -r a8dceec7f530 -r aef2a98d802b 
sql/src/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/src/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out Tue Nov 
09 01:00:32 2010 +0100
+++ b/sql/src/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out Tue Nov 
09 09:21:46 2010 +0100
@@ -40,12 +40,12 @@
 | | | | | project (                                                            
                                                                                
                                                                                
                             |
 | | | | | | select (                                                           
                                                                                
                                                                                
                             |
 | | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.type as p.type, 
_tables.%TID% NOT NULL as p.%TID% ] |
-| | | | | | ) [ p.type < convert(2) ]                                          
                                                                                
                                                                                
                             |
+| | | | | | ) [ p.type < convert(2 from tinyint to smallint) ]                 
                                    |
 | | | | | ) [ p.id, p.type ],                                                  
                                   |
 | | | | | project (                                                            
                                                                                
                                                                                
                             |
 | | | | | | select (                                                           
                                                                                
                                                                                
                             |
 | | | | | | | table(tmp._tables) [ _tables.id as t.id, _tables.type as t.type, 
_tables.%TID% NOT NULL as t.%TID% ] |
-| | | | | | ) [ t.type < convert(2) ]                                          
                                                                                
                                                                                
                             |
+| | | | | | ) [ t.type < convert(2 from tinyint to smallint) ]                 
                                    |
 | | | | | ) [ t.id, t.type ]                                                   
                                   |
 | | | | ) [ id as tables.id, type as tables.type ]                             
                                   |
 | | | ) [ tables.id ]                                                          
                                                                                
                                                                                
                             |
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to