Changeset: 04bf99aca82e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=04bf99aca82e
Modified Files:
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
        sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
Branch: SciQL-2
Log Message:

approved stable output:
in the SciQL-2 branch, in the SQL catalog,
column column.storage_type[int] has been replaced by
column.storage[varchar(256)]


diffs (60 lines):

diff --git 
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
 
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
--- 
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
+++ 
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
@@ -46,7 +46,7 @@ Ready.
 % .L,  .L,     .L,     .L,     .L,     .L,     .L,     .L,     .L,     .L,     
.L,     .L,     .L,     .L,     .L,     .L,     .L,     .L,     .L # table_name
 % table_cat,   table_schem,    table_name,     column_name,    type_name,      
column_size,    decimal_digits, buffer_length,  num_prec_radix, nullable,       
remarks,        column_def,     sql_data_type,  sql_datetime_sub,       
char_octet_length,      ordinal_position,       scope_catalog,  scope_schema,   
scope_table # name
 % char,        varchar,        varchar,        varchar,        varchar,        
int,    int,    tinyint,        tinyint,        char,   char,   varchar,        
tinyint,        tinyint,        tinyint,        bigint, char,   char,   char # 
type
-% 0,   3,      9,      12,     7,      4,      1,      1,      2,      0,      
0,      0,      1,      1,      1,      2,      0,      0,      0 # length
+% 0,   3,      9,      11,     7,      4,      1,      1,      2,      0,      
0,      0,      1,      1,      1,      2,      0,      0,      0 # length
 [ NULL,        "sys",  "args", "id",   "int",  32,     0,      0,      10,     
NULL,   NULL,   NULL,   0,      0,      0,      1,      NULL,   NULL,   NULL    
]
 [ NULL,        "sys",  "args", "func_id",      "int",  32,     0,      0,      
10,     NULL,   NULL,   NULL,   0,      0,      0,      2,      NULL,   NULL,   
NULL    ]
 [ NULL,        "sys",  "args", "name", "varchar",      256,    0,      0,      
10,     NULL,   NULL,   NULL,   0,      0,      0,      3,      NULL,   NULL,   
NULL    ]
@@ -63,7 +63,7 @@ Ready.
 [ NULL,        "sys",  "columns",      "default",      "varchar",      2048,   
0,      0,      10,     NULL,   NULL,   NULL,   0,      0,      0,      7,      
NULL,   NULL,   NULL    ]
 [ NULL,        "sys",  "columns",      "null", "boolean",      1,      0,      
0,      10,     NULL,   NULL,   NULL,   0,      0,      0,      8,      NULL,   
NULL,   NULL    ]
 [ NULL,        "sys",  "columns",      "number",       "int",  32,     0,      
0,      10,     NULL,   NULL,   NULL,   0,      0,      0,      9,      NULL,   
NULL,   NULL    ]
-[ NULL,        "sys",  "columns",      "storage_type", "int",  32,     0,      
0,      10,     NULL,   NULL,   NULL,   0,      0,      0,      10,     NULL,   
NULL,   NULL    ]
+[ NULL,        "sys",  "columns",      "storage",      "varchar",      2048,   
0,      0,      10,     NULL,   NULL,   NULL,   0,      0,      0,      10,     
NULL,   NULL,   NULL    ]
 [ NULL,        "sys",  "functions",    "id",   "int",  32,     0,      0,      
10,     NULL,   NULL,   NULL,   0,      0,      0,      1,      NULL,   NULL,   
NULL    ]
 [ NULL,        "sys",  "functions",    "name", "varchar",      256,    0,      
0,      10,     NULL,   NULL,   NULL,   0,      0,      0,      2,      NULL,   
NULL,   NULL    ]
 [ NULL,        "sys",  "functions",    "func", "varchar",      8196,   0,      
0,      10,     NULL,   NULL,   NULL,   0,      0,      0,      3,      NULL,   
NULL,   NULL    ]
diff --git a/sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out 
b/sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
--- a/sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
+++ b/sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
@@ -27,7 +27,7 @@ Ready.
 % sys.schemas, .tables,        .columns # table_name
 % name,        name,   name # name
 % varchar,     varchar,        varchar # type
-% 3,   9,      12 # length
+% 3,   9,      11 # length
 [ "sys",       "args", "func_id"       ]
 [ "sys",       "args", "id"    ]
 [ "sys",       "args", "name"  ]
@@ -40,7 +40,7 @@ Ready.
 [ "sys",       "columns",      "name"  ]
 [ "sys",       "columns",      "null"  ]
 [ "sys",       "columns",      "number"        ]
-[ "sys",       "columns",      "storage_type"  ]
+[ "sys",       "columns",      "storage"       ]
 [ "sys",       "columns",      "table_id"      ]
 [ "sys",       "columns",      "type"  ]
 [ "sys",       "columns",      "type_digits"   ]
@@ -102,7 +102,7 @@ Ready.
 % sys.s,       .t,     .c # table_name
 % name,        name,   name # name
 % varchar,     varchar,        varchar # type
-% 3,   9,      12 # length
+% 3,   9,      11 # length
 [ "sys",       "args", "func_id"       ]
 [ "sys",       "args", "id"    ]
 [ "sys",       "args", "name"  ]
@@ -115,7 +115,7 @@ Ready.
 [ "sys",       "columns",      "name"  ]
 [ "sys",       "columns",      "null"  ]
 [ "sys",       "columns",      "number"        ]
-[ "sys",       "columns",      "storage_type"  ]
+[ "sys",       "columns",      "storage"       ]
 [ "sys",       "columns",      "table_id"      ]
 [ "sys",       "columns",      "type"  ]
 [ "sys",       "columns",      "type_digits"   ]
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to