Changeset: bf0412e53ac9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf0412e53ac9
Modified Files:
monetdb5/modules/mal/tablet_sql.c
sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
Branch: default
Log Message:
output error on client stream
diffs (35 lines):
diff --git a/monetdb5/modules/mal/tablet_sql.c
b/monetdb5/modules/mal/tablet_sql.c
--- a/monetdb5/modules/mal/tablet_sql.c
+++ b/monetdb5/modules/mal/tablet_sql.c
@@ -785,7 +785,7 @@ SQLload_file(Client cntxt, Tablet *as, b
}
if (task->b->pos < task->b->len && cnt < (BUN) maxrow && task->ateof) {
- GDKerror("Incomplete record at end of file.\n");
+ showException(task->out, MAL, "copy_from", "Incomplete record
at end of file.\n");
/* indicate that we did read everything (even if we couldn't
* deal with it */
task->b->pos = task->b->len;
diff --git
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
---
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
+++
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
@@ -76,7 +76,7 @@ stderr of test 'hang_on_copy_into.SF-110
# 23:26:36 > mclient -lsql -i --host=eir --port=38510
# 23:26:36 >
-MAPI = monetdb@madrid:31246
+MAPI = monetdb@niels:39769
QUERY = COPY 1 RECORDS INTO "news" FROM stdin USING DELIMITERS '\t', '\n',
'''';
1 'dwerg.net word volwassen, er is eindelijk content
en het voicemail archief begint al aardig vol te lopen.
@@ -89,8 +89,8 @@ QUERY = COPY 1 RECORDS INTO "news" FROM
allemaal nogal lang duurt, maar in principe is het nog
maar een uurtje of 6 werk om het goed te krijgen. Zoals
je kan zien heb ik bij de voicemails al wat leuke
-ERROR = !failed to import table
- !Incomplete record at end of file.
+ERROR = !MALException:copy_from:Incomplete record at end of file.
+ !failed to import table
# 23:26:36 >
# 23:26:36 > Done.
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
