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

Merged from Oct2010


diffs (truncated from 496 to 300 lines):

diff -r 969453662b9d -r 7cfb21f75108 
sql/src/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.stable.err
--- 
a/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.stable.err
   Tue Oct 26 10:51:18 2010 +0200
+++ 
b/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.stable.err
   Tue Oct 26 15:32:23 2010 +0200
@@ -10,10 +10,6 @@
 # 18:37:34 >  Mtimeout -timeout 60 MapiClient -lsql -u monetdb -P monetdb 
--host=localhost --port=49484  < huge_expression_and_column_name.SF-921173.sql
 # 18:37:34 >  
 
-MAPI  = mone...@localhost:30596
-ACTION= read_line
-QUERY = select 
1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1
-ERROR = !Connection terminated
 
 # 18:37:34 >  
 # 18:37:34 >  Done.
diff -r 969453662b9d -r 7cfb21f75108 
sql/src/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.stable.out
--- 
a/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.stable.out
   Tue Oct 26 10:51:18 2010 +0200
+++ 
b/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.stable.out
   Tue Oct 26 15:32:23 2010 +0200
@@ -26,6 +26,13 @@
 # 16:51:10 >  mclient -lsql -i --host=localhost --port=30596 
 # 16:51:10 >  
 
+#select 
1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1+(1
+% . # table_name
+% sql_add_single_value # name
+% int # type
+% 4 # length
+[ 2001  ]
+
 
 # 16:51:10 >  
 # 16:51:10 >  Done.
diff -r 969453662b9d -r 7cfb21f75108 
sql/src/test/BugTracker/Tests/authorization.SF-1430616-drop_user.sql
--- a/sql/src/test/BugTracker/Tests/authorization.SF-1430616-drop_user.sql      
Tue Oct 26 10:51:18 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/authorization.SF-1430616-drop_user.sql      
Tue Oct 26 15:32:23 2010 +0200
@@ -1,7 +1,7 @@
 START TRANSACTION;
 
 ALTER USER "voc" SET SCHEMA "sys";
+DROP SCHEMA "voc";
 DROP USER "voc";
-DROP SCHEMA "voc";
 
 COMMIT;
diff -r 969453662b9d -r 7cfb21f75108 
sql/src/test/BugTracker/Tests/authorization.SF-1430616.stable.err
--- a/sql/src/test/BugTracker/Tests/authorization.SF-1430616.stable.err Tue Oct 
26 10:51:18 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/authorization.SF-1430616.stable.err Tue Oct 
26 15:32:23 2010 +0200
@@ -88,10 +88,6 @@
 # 11:28:17 >  Mtimeout -timeout 60  java nl.cwi.monetdb.client.JdbcClient -e 
-h pegasus -p 32408 -d mTests_src_test_BugTracker -f 
"../../../../../../../../../../mirror/fabian/monetdb/stable/sql/src/test/BugTracker/Tests/authorization.SF-1430616-drop_user.sql"
 # 11:28:17 >  
 
-Error on line 4: DROP USER: 'voc' owns a schema
-Error on line 5: current transaction is aborted (please ROLLBACK)
-Error on line 7: SQLException:sql.trans:COMMIT: failed
-ERROR: COMMIT: transaction is aborted, will ROLLBACK instead
 
 # 11:28:18 >  
 # 11:28:18 >  Done.
diff -r 969453662b9d -r 7cfb21f75108 
sql/src/test/BugTracker/Tests/authorization.SF-1430616.stable.out
--- a/sql/src/test/BugTracker/Tests/authorization.SF-1430616.stable.out Tue Oct 
26 10:51:18 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/authorization.SF-1430616.stable.out Tue Oct 
26 15:32:23 2010 +0200
@@ -78,10 +78,16 @@
 ALTER USER "voc" SET SCHEMA "sys";
 Operation successful
 
+DROP SCHEMA "voc";
+Operation successful
+
 DROP USER "voc";
-DROP SCHEMA "voc";
+Operation successful
+
 
 COMMIT;
+Operation successful
+
 
 # 15:18:12 >  
 # 15:18:12 >  Done.
diff -r 969453662b9d -r 7cfb21f75108 
sql/src/test/BugTracker/Tests/join_table_with_floats.SF-1907060.sql
--- a/sql/src/test/BugTracker/Tests/join_table_with_floats.SF-1907060.sql       
Tue Oct 26 10:51:18 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/join_table_with_floats.SF-1907060.sql       
Tue Oct 26 15:32:23 2010 +0200
@@ -1,8 +1,8 @@
-create table t2 (id float);
-create table t1 (age float);
+create table t1907060_2 (id float);
+create table t1907060_1 (age float);
 
-select age from t1, t2 where id < 0.0 limit 10;
+select age from t1907060_1, t1907060_2 where id < 0.0 limit 10;
 
-drop table t1;
-drop table t2;
+drop table t1907060_1;
+drop table t1907060_2;
 
diff -r 969453662b9d -r 7cfb21f75108 
sql/src/test/BugTracker/Tests/join_table_with_floats.SF-1907060.stable.out
--- 
a/sql/src/test/BugTracker/Tests/join_table_with_floats.SF-1907060.stable.out    
    Tue Oct 26 10:51:18 2010 +0200
+++ 
b/sql/src/test/BugTracker/Tests/join_table_with_floats.SF-1907060.stable.out    
    Tue Oct 26 15:32:23 2010 +0200
@@ -22,11 +22,14 @@
 
 Over..
 
-# 00:15:27 >  
-# 00:15:27 >  mclient -lsql -umonetdb -Pmonetdb --host=amelia --port=30709 
-# 00:15:27 >  
+# 12:40:48 >  
+# 12:40:48 >  mclient -lsql -ftest -i -e --host=volund --port=31465 
+# 12:40:48 >  
 
-% sys.t1 # table_name
+#create table t1907060_2 (id float);
+#create table t1907060_1 (age float);
+#select age from t1907060_1, t1907060_2 where id < 0.0 limit 10;
+% sys.t1907060_1 # table_name
 % age # name
 % double # type
 % 22 # length
diff -r 969453662b9d -r 7cfb21f75108 
sql/src/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out
--- a/sql/src/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out  
Tue Oct 26 10:51:18 2010 +0200
+++ b/sql/src/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out  
Tue Oct 26 15:32:23 2010 +0200
@@ -209,30 +209,30 @@
 START TRANSACTION;
 Operation successful
 
-SELECT class FROM a EXCEPT SELECT 16; -- all but 16
+SELECT class FROM a EXCEPT SELECT 16 ORDER BY class; -- all but 16
 +-------+
 | class |
 +=======+
-|    17 |
 |     2 |
 |    11 |
+|    17 |
 |    18 |
 +-------+
 4 rows
 
-SELECT class FROM a UNION SELECT 16; -- all with 16 (distinct so invisible)
+SELECT class FROM a UNION SELECT 16 ORDER BY class; -- all with 16 (distinct 
so invisible)
 +--------+
 | class  |
 +========+
+|      2 |
+|     11 |
+|     16 |
 |     17 |
-|      2 |
-|     16 |
-|     11 |
 |     18 |
 +--------+
 5 rows
 
-SELECT class FROM a INTERSECT SELECT 16; -- just 16
+SELECT class FROM a INTERSECT SELECT 16 ORDER BY class; -- just 16
 +-------+
 | class |
 +=======+
@@ -248,63 +248,63 @@
 START TRANSACTION;
 Operation successful
 
-SELECT * FROM a EXCEPT SELECT * FROM b; -- should be last 50% of a
+SELECT * FROM a EXCEPT SELECT * FROM b ORDER BY class, property; -- should be 
last 50% of a
 +----------+-------+
 | property | class |
 +==========+=======+
+|       13 |    11 |
+|       12 |    16 |
+|       15 |    16 |
+|       25 |    16 |
+|       26 |    16 |
 |       29 |    16 |
-|       12 |    16 |
-|       13 |    11 |
-|       26 |    16 |
-|       25 |    16 |
 |       23 |    18 |
 |       24 |    18 |
-|       15 |    16 |
 +----------+-------+
 8 rows
 
-SELECT * FROM a UNION SELECT * FROM b; -- should be a + last 50% of b
+SELECT * FROM a UNION SELECT * FROM b ORDER BY class, property; -- should be a 
+ last 50% of b
 +----------+--------+
 | property | class  |
 +==========+========+
-|        1 |     17 |
-|       21 |     17 |
-|       22 |     17 |
 |       20 |      2 |
-|       19 |     17 |
+|       12 |     10 |
+|       13 |     11 |
+|       11 |     15 |
+|       14 |     15 |
+|       24 |     15 |
+|       25 |     15 |
+|       28 |     15 |
 |        4 |     16 |
 |        5 |     16 |
 |        6 |     16 |
+|       12 |     16 |
+|       15 |     16 |
+|       25 |     16 |
+|       26 |     16 |
 |       29 |     16 |
-|       12 |     16 |
-|       13 |     11 |
-|       26 |     16 |
-|       25 |     16 |
+|        1 |     17 |
+|       19 |     17 |
+|       21 |     17 |
+|       22 |     17 |
+|       23 |     17 |
 |       23 |     18 |
 |       24 |     18 |
-|       15 |     16 |
-|       28 |     15 |
-|       11 |     15 |
-|       12 |     10 |
-|       25 |     15 |
-|       24 |     15 |
-|       23 |     17 |
-|       14 |     15 |
 +----------+--------+
 23 rows
 
-SELECT * FROM a INTERSECT SELECT * FROM b; -- should be first 50% of a
+SELECT * FROM a INTERSECT SELECT * FROM b ORDER BY class, property; -- should 
be first 50% of a
 +----------+-------+
 | property | class |
 +==========+=======+
-|        1 |    17 |
-|       21 |    17 |
-|       22 |    17 |
 |       20 |     2 |
-|       19 |    17 |
 |        4 |    16 |
 |        5 |    16 |
 |        6 |    16 |
+|        1 |    17 |
+|       19 |    17 |
+|       21 |    17 |
+|       22 |    17 |
 +----------+-------+
 8 rows
 
@@ -317,7 +317,7 @@
 START TRANSACTION;
 Operation successful
 
-select * from ( SELECT class FROM a EXCEPT ALL SELECT 16 ) as t order by 
class; -- all but one 16 (will have 16 in output!)
+SELECT class FROM a EXCEPT ALL SELECT 16 ORDER BY class; -- all but one 16 
(will have 16 in output!)
 +--------+
 |  class |
 +========+
@@ -339,31 +339,31 @@
 +--------+
 15 rows
 
-SELECT class FROM a UNION ALL SELECT 16; -- all plus 16
+SELECT class FROM a UNION ALL SELECT 16 ORDER BY class; -- all plus 16
 +--------+
 | class  |
 +========+
-|     17 |
-|     17 |
-|     17 |
 |      2 |
-|     17 |
-|     16 |
-|     16 |
-|     16 |
-|     16 |
-|     16 |
 |     11 |
 |     16 |
 |     16 |
+|     16 |
+|     16 |
+|     16 |
+|     16 |
+|     16 |
+|     16 |
+|     16 |
+|     17 |
+|     17 |
+|     17 |
+|     17 |
 |     18 |
 |     18 |
-|     16 |
-|     16 |
 +--------+
 17 rows
 
-SELECT class FROM a INTERSECT ALL SELECT 16; -- just one 16 (!)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to