Changeset: 35b2b2e4b5e1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=35b2b2e4b5e1
Modified Files:
sql/server/rel_schema.c
sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.err
sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.out
Branch: Mar2018
Log Message:
Wrong test number and use lower case
diffs (32 lines):
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1940,8 +1940,8 @@ rel_create_index(mvc *sql, char *iname,
if (!t) {
return sql_error(sql, 02, SQLSTATE(42S02) "CREATE INDEX: no
such table '%s'", tname);
} else if (isView(t) || isMergeTable(t) || isRemote(t)) {
- return sql_error(sql, 02, SQLSTATE(42S02) "CREATE INDEX: cannot
create index on %s '%s'", isView(t)?"VIEW":
- isMergeTable(t)?"MERGE
TABLE":"REMOTE TABLE", tname);
+ return sql_error(sql, 02, SQLSTATE(42S02) "CREATE INDEX: cannot
create index on %s '%s'", isView(t)?"view":
+ isMergeTable(t)?"merge
table":"remote table", tname);
}
sname = get_schema_name( sql, sname, tname);
nt = dup_sql_table(sql->sa, t);
diff --git
a/sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.err
b/sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.err
--- a/sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.err
+++ b/sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'nested-merge-tables.Bug-6584` in directory
'sql/test/BugTracker-2018` itself:
+stderr of test 'nested-merge-tables.Bug-6585` in directory
'sql/test/BugTracker-2018` itself:
# 13:40:48 >
diff --git
a/sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.out
b/sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.out
--- a/sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.out
+++ b/sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'nested-merge-tables.Bug-6584` in directory
'sql/test/BugTracker-2018` itself:
+stdout of test 'nested-merge-tables.Bug-6585` in directory
'sql/test/BugTracker-2018` itself:
# 13:40:48 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list