Changeset: da75bedb5629 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da75bedb5629
Modified Files:
clients/mapiclient/tomograph.c
monetdb5/modules/mal/tablet.c
sql/server/sql_scan.c
sql/storage/bat/bat_storage.c
sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/copy/Tests/nonutf8.sql
sql/test/copy/Tests/nonutf8.stable.err
sql/test/copy/Tests/nonutf8.stable.out
Branch: HTM
Log Message:
Merge with default branch
diffs (296 lines):
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -450,8 +450,8 @@ usageTomograph(void)
fprintf(stderr, " -p | --port=<portnr>\n");
fprintf(stderr, " -h | --host=<hostname>\n");
fprintf(stderr, " -T | --title=<plot title>\n");
- fprintf(stderr, " -r | --range=<starttime>-<endtime>[ms,s] \n");
- fprintf(stderr, " -i | --input=<profiler event file > \n");
+ fprintf(stderr, " -r | --range=<starttime>-<endtime>[ms,s]\n");
+ fprintf(stderr, " -i | --input=<profiler event file >\n");
fprintf(stderr, " -o | --output=<dir/file prefix > (default
'cache/<dbname>'\n");
fprintf(stderr, " -b | --beat=<delay> in milliseconds (default
5000)\n");
fprintf(stderr, " -A | --atlas=<number> maximum number of queries
(default 1)\n");
@@ -868,7 +868,7 @@ showcpu(void)
prev = i;
}
if( cpus)
- fprintf(gnudata," plot 0 notitle with lines\n unset
for[i=1:%d] object i \n",object);
+ fprintf(gnudata," plot 0 notitle with lines\n unset
for[i=1:%d] object i\n",object);
fprintf(gnudata, "set border\n");
fprintf(gnudata, "unset yrange\n");
fprintf(gnudata, "unset ytics\n");
@@ -930,14 +930,14 @@ showio(void)
fprintf(gnudata, "plot \"%s_%02d.dat\" using 1:($4/%d.0) notitle with
dots fs solid linecolor rgb \"gray\" ,\\\n", basefile, atlaspage, b);
fprintf(gnudata, "\"%s_%02d.dat\" using ($1+4):($5/%d.0) notitle with
dots solid linecolor rgb \"red\"\n", basefile, atlaspage, b);
//fprintf(gnudata, "\"%s_%02d.dat\" using ($1+8):($6/%d.0) notitle with
dots linecolor rgb \"green\", \\\n", basefile, atlaspage, b);
- //fprintf(gnudata, "\"%s_%02d.dat\" using ($1+12):($7/%d.0) notitle
with dots linecolor rgb \"purple\" \n", basefile, atlaspage, b);
+ //fprintf(gnudata, "\"%s_%02d.dat\" using ($1+12):($7/%d.0) notitle
with dots linecolor rgb \"purple\"\n", basefile, atlaspage, b);
#else
/* this is a slightly modified version that produces decent results on
* all platforms */
fprintf(gnudata, "plot \"%s_%02d.dat\" using 1:($4/%d.0) notitle with
dots linecolor rgb \"gray\" ,\\\n", basefile, atlaspage, b);
fprintf(gnudata, "\"%s_%02d.dat\" using ($1+4):($5/%d.0) notitle with
dots linecolor rgb \"red\"\n", basefile, atlaspage, b);
//fprintf(gnudata, "\"%s_%02d.dat\" using ($1+8):($6/%d.0) notitle with
dots linecolor rgb \"green\", \\\n", basefile, atlaspage, b);
- //fprintf(gnudata, "\"%s_%02d.dat\" using ($1+12):($7/%d.0) notitle
with dots linecolor rgb \"purple\" \n", basefile, atlaspage, b);
+ //fprintf(gnudata, "\"%s_%02d.dat\" using ($1+12):($7/%d.0) notitle
with dots linecolor rgb \"purple\"\n", basefile, atlaspage, b);
#endif
fprintf(gnudata, "unset y2label\n");
fprintf(gnudata, "unset y2tics\n");
@@ -1272,7 +1272,7 @@ createTomogram(void)
height = (cpus+1) * 2 * h;
fprintf(gnudata, "set yrange [0:%d]\n", height);
fprintf(gnudata, "set ylabel \"worker threads\"\n");
- fprintf(gnudata, "set key right \n");
+ fprintf(gnudata, "set key right\n");
fprintf(gnudata, "unset colorbox\n");
fprintf(gnudata, "unset title\n");
@@ -1312,9 +1312,10 @@ createTomogram(void)
dumpbox(i);
// always show a start line
if ( box[i].clkend - box[i].clkstart < w/200.0)
- fprintf(gnudata, "set object %d
rectangle from "LLFMT".0, %d.0 to %4.2f, %d.0 fillcolor rgb \"%s\" fillstyle
solid 1.0 \n",
- object++, box[i].clkstart,
(rowoffset + box[i].row) * 2 * h, box[i].clkstart+2.0, (rowoffset +
box[i].row) * 2 * h + h, colors[box[i].color].col);
- fprintf(gnudata, "set object %d
rectangle from "LLFMT".0, %d.0 to "LLFMT".0, %d fillcolor rgb \"%s\" fillstyle
solid 1.0 \n",
+ fprintf(gnudata, "set object %d
rectangle from "LLFMT".0, %d.0 to "LLFMT".0, %d.0 fillcolor rgb \"%s\"
fillstyle solid 1.0\n",
+ object++, box[i].clkstart,
(rowoffset + box[i].row) * 2 * h, box[i].clkstart+2, (rowoffset + box[i].row)
* 2 * h + h, colors[box[i].color].col);
+ else
+ fprintf(gnudata, "set object %d
rectangle from "LLFMT".0, %d.0 to "LLFMT".0, %d.0 fillcolor rgb \"%s\"
fillstyle solid 1.0\n",
object++, box[i].clkstart,
(rowoffset + box[i].row) * 2 * h, box[i].clkend, (rowoffset + box[i].row) * 2
* h + h, colors[box[i].color].col);
break;
case MDB_PING:
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1629,15 +1629,6 @@ SQLload_file(Client cntxt, Tablet *as, b
else
task->maxrow = (BUN) maxrow;
- /* task->base is always allocated since it is part of the task struct.
- * However, the arrays assigned within may be zero if GDKzalloc
failed.*/
- for (i = 0; i < MAXBUFFERS; i++) {
- if (task->base[i] == NULL) {
- tablet_error(task, lng_nil, int_nil, NULL,
"SQLload_file");
- goto bailout;
- }
- }
-
if (task->fields == 0 || task->cols == 0 || task->time == 0) {
tablet_error(task, lng_nil, int_nil, NULL, "SQLload_file");
goto bailout;
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -621,7 +621,7 @@ scanner_string(mvc *c, int quote)
cur = scanner_getc(lc);
}
}
- (void) sql_error(c, 2, "unexpected end of input");
+ (void) sql_error(c, 2, "%s", lc->errstr ? lc->errstr : "unexpected end
of input");
return LEX_ERROR;
}
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -804,7 +804,7 @@ dcount_col(sql_trans *tr, sql_column *c)
dbl f = 1.0;
BAT *v = delta_bind_bat(b, RDONLY, 0), *o = v, *u;
- if ((dcnt = BATcount(v)) > 1024*1024) {
+ if ((dcnt = (size_t) BATcount(v)) > 1024*1024) {
v = BATsample(v, 1024);
f = dcnt/1024.0;
}
@@ -812,7 +812,7 @@ dcount_col(sql_trans *tr, sql_column *c)
bat_destroy(o);
if (v!=o)
bat_destroy(v);
- dcnt = BATcount(u)*f;
+ dcnt = (size_t) (BATcount(u) * f);
bat_destroy(u);
return dcnt;
} else {
diff --git a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql
b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql
--- a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql
+++ b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql
@@ -105,10 +105,10 @@ INSERT INTO "bidder" ("id", "open_auctio
(59, 'open_auction11', '05/08/2000', '06:44:20', 'person3', 4.5),
(60, 'open_auction11', '10/22/2001', '15:34:49', 'person4', 15);
-Select b.* FROM open_auctions o, b bidder WHERE (select b3.INCREASE from
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id =
b.open_auction_id;
+Select b.* FROM open_auctions o, b bidder WHERE (select b3.INCREASE from
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id =
b.open_auction_id order by date, time;
plan Select b.* FROM open_auctions o, bidder b WHERE (select b3.INCREASE from
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id =
b.open_auction_id;
-Select b.* FROM open_auctions o, bidder b WHERE (select b3.INCREASE from
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id =
b.open_auction_id;
+Select b.* FROM open_auctions o, bidder b WHERE (select b3.INCREASE from
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id =
b.open_auction_id order by date, time;
drop table bidder;
drop table open_auctions;
diff --git a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err
b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err
--- a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err
+++ b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err
@@ -30,8 +30,8 @@ stderr of test 'crash.Bug-3736` in direc
# 10:50:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30636" "--port=38510"
# 10:50:37 >
-MAPI = (monetdb) /var/tmp/mtest-30636/.s.monetdb.38510
-QUERY = Select b.* FROM open_auctions o, b bidder WHERE (select b3.INCREASE
from bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id =
b.open_auction_id;
+MAPI = (monetdb) /var/tmp/mtest-6362/.s.monetdb.36855
+QUERY = Select b.* FROM open_auctions o, b bidder WHERE (select b3.INCREASE
from bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id =
b.open_auction_id order by date, time;
ERROR = !SELECT: no such table 'b'
# 10:50:38 >
diff --git a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
--- a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
+++ b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
@@ -96,15 +96,15 @@ project (
| | | | | | | | | | | | | ) [ ]
| | | | | | | | | | | | ) [ L10.L10 HASHCOL , o.id NOT NULL HASHCOL ,
o.open_auction_id NOT NULL, b.id NOT NULL HASHCOL , b.open_auction_id NOT NULL,
b.date NOT NULL, b.time NOT NULL, b.personref NOT NULL, b.increase NOT NULL,
b3.id NOT NULL HASHCOL , b3.increase NOT NULL, sys.identity(o.id NOT NULL
HASHCOL ) HASHCOL as L7.L7 ]
| | | | | | | | | | | ) [ b3a.open_auction_id NOT NULL = o.open_auction_id NOT
NULL ]
-| | | | | | | | | | ) [ L10.L10, L7.L7 ] [ L10.L10 HASHCOL , o.id NOT NULL
HASHCOL , o.open_auction_id NOT NULL, b.id NOT NULL HASHCOL , b.open_auction_id
NOT NULL, b.date NOT NULL, b.time NOT NULL, b.personref NOT NULL, b.increase
NOT NULL, b3.id NOT NULL HASHCOL , b3.increase NOT NULL, L7.L7 HASHCOL ,
sys.min no nil (b3a.id NOT NULL HASHCOL ) NOT NULL as L1.L1 ]
+| | | | | | | | | | ) [ L7.L7, L10.L10 ] [ L10.L10 HASHCOL , o.id NOT NULL
HASHCOL , o.open_auction_id NOT NULL, b.id NOT NULL HASHCOL , b.open_auction_id
NOT NULL, b.date NOT NULL, b.time NOT NULL, b.personref NOT NULL, b.increase
NOT NULL, b3.id NOT NULL HASHCOL , b3.increase NOT NULL, L7.L7 HASHCOL ,
sys.min no nil (b3a.id NOT NULL HASHCOL ) NOT NULL as L1.L1 ]
| | | | | | | | | ) [ b3.id NOT NULL HASHCOL = L1 NOT NULL ]
| | | | | | | | ) [ o.id NOT NULL HASHCOL , o.open_auction_id NOT NULL, b.id
NOT NULL HASHCOL , b.open_auction_id NOT NULL, b.date NOT NULL, b.time NOT
NULL, b.personref NOT NULL, b.increase NOT NULL, b3.increase NOT NULL as L2.L2,
sys.identity(o.id NOT NULL HASHCOL ) HASHCOL as L12.L12 ]
| | | | | | | ) [ ]
| | | | | | ) [ L2.L2 NOT NULL, L12.L12 HASHCOL , o.id NOT NULL HASHCOL ,
o.open_auction_id NOT NULL, b.id NOT NULL HASHCOL , b.open_auction_id NOT NULL,
b.date NOT NULL, b.time NOT NULL, b.personref NOT NULL, b.increase NOT NULL,
L5.id NOT NULL, L5.increase NOT NULL, sys.identity(o.id NOT NULL HASHCOL )
HASHCOL as L11.L11 ]
| | | | | ) [ L6.open_auction_id NOT NULL = o.open_auction_id NOT NULL ]
-| | | | ) [ L12.L12, L11.L11 ] [ L2.L2 NOT NULL, L12.L12 HASHCOL , b.id NOT
NULL HASHCOL , b.open_auction_id NOT NULL, b.date NOT NULL, b.time NOT NULL,
b.personref NOT NULL, b.increase NOT NULL, L5.id NOT NULL, L5.increase NOT
NULL, L11.L11 HASHCOL , sys.max no nil (L6.id NOT NULL HASHCOL as b2a.id) NOT
NULL as L3.L3 ]
+| | | | ) [ L11.L11, L12.L12 ] [ L2.L2 NOT NULL, L12.L12 HASHCOL , b.id NOT
NULL HASHCOL , b.open_auction_id NOT NULL, b.date NOT NULL, b.time NOT NULL,
b.personref NOT NULL, b.increase NOT NULL, L5.id NOT NULL, L5.increase NOT
NULL, L11.L11 HASHCOL , sys.max no nil (L6.id NOT NULL HASHCOL as b2a.id) NOT
NULL as L3.L3 ]
| | | ) [ L5.id NOT NULL = L3.L3 NOT NULL ]
-| | ) [ L2.L2 NOT NULL, L12.L12 HASHCOL , b.id NOT NULL HASHCOL ,
b.open_auction_id NOT NULL, b.date NOT NULL, b.time NOT NULL, b.personref NOT
NULL, b.increase NOT NULL, L5.id NOT NULL, L5.increase NOT NULL, L11.L11
HASHCOL , L3.L3 NOT NULL, sys.sql_mul(L2.L2 NOT NULL, double[tinyint "2"]) as
L13.L13, L5.increase NOT NULL as L14.L14 ]
+| | ) [ L2.L2 NOT NULL, L12.L12 HASHCOL , b.id NOT NULL HASHCOL ,
b.open_auction_id NOT NULL, b.date NOT NULL, b.time NOT NULL, b.personref NOT
NULL, b.increase NOT NULL, L5.id NOT NULL, L5.increase NOT NULL, L11.L11
HASHCOL , L3.L3 NOT NULL, sys.sql_mul(L2.L2 NOT NULL, double "2.000000") as
L13.L13, L5.increase NOT NULL as L14.L14 ]
| ) [ L13.L13 <= L14.L14 NOT NULL ]
) [ b.id NOT NULL HASHCOL , b.open_auction_id NOT NULL, b.date NOT NULL,
b.time NOT NULL, b.personref NOT NULL, b.increase NOT NULL ]
#Select b.* FROM open_auctions o, bidder b WHERE (select b3.INCREASE from
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id =
b.open_auction_id;
@@ -112,16 +112,16 @@ project (
% id, open_auction_id, date, time, personref, increase # name
% int, varchar, varchar, varchar, varchar, double
# type
% 2, 13, 10, 8, 8, 24 # length
-[ 5, "open_auction1", "11/12/1998", "11:23:38", "person20",
4.5 ]
-[ 6, "open_auction1", "10/02/2000", "22:48:00", "person4",
15 ]
-[ 7, "open_auction1", "12/04/1998", "22:29:38", "person23",
1.5 ]
+[ 11, "open_auction1", "05/21/2001", "08:02:16", "person5",
12 ]
[ 8, "open_auction1", "06/22/1999", "12:43:47", "person19",
15 ]
-[ 9, "open_auction1", "12/02/2001", "13:38:51", "person15",
45 ]
-[ 10, "open_auction1", "11/12/2001", "04:50:27", "person9",
6 ]
-[ 11, "open_auction1", "05/21/2001", "08:02:16", "person5",
12 ]
[ 29, "open_auction5", "07/07/2000", "08:53:00", "person15",
6 ]
[ 30, "open_auction5", "08/06/2001", "10:16:15", "person13",
4.5 ]
[ 31, "open_auction5", "08/23/1999", "08:26:06", "person17",
30 ]
+[ 6, "open_auction1", "10/02/2000", "22:48:00", "person4",
15 ]
+[ 5, "open_auction1", "11/12/1998", "11:23:38", "person20",
4.5 ]
+[ 10, "open_auction1", "11/12/2001", "04:50:27", "person9",
6 ]
+[ 9, "open_auction1", "12/02/2001", "13:38:51", "person15",
45 ]
+[ 7, "open_auction1", "12/04/1998", "22:29:38", "person23",
1.5 ]
#drop table bidder;
#drop table open_auctions;
diff --git a/sql/test/copy/Tests/nonutf8.sql b/sql/test/copy/Tests/nonutf8.sql
--- a/sql/test/copy/Tests/nonutf8.sql
+++ b/sql/test/copy/Tests/nonutf8.sql
@@ -2,11 +2,11 @@
start transaction;
create table nonutf8 ( s string);
-insert into nonutf8 values ('zwaar lange golf piek -dal �10cm vak5');
+insert into nonutf8 values ('zwaar lange golf piek -dal ±10cm vak5');
copy 2 records into nonutf8 from stdin;
-zwaar lange golf piek -dal �10cm vak5
-�17 %
+zwaar lange golf piek -dal ±10cm vak5
+±17 %
select * from nonutf8;
diff --git a/sql/test/copy/Tests/nonutf8.stable.err
b/sql/test/copy/Tests/nonutf8.stable.err
--- a/sql/test/copy/Tests/nonutf8.stable.err
+++ b/sql/test/copy/Tests/nonutf8.stable.err
@@ -1,11 +1,11 @@
stderr of test 'nonutf8` in directory 'sql/test/copy` itself:
-# 10:26:04 >
-# 10:26:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33851" "--set"
"mapi_usock=/var/tmp/mtest-3524/.s.monetdb.33851" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/resultset//Linux/var/MonetDB/mTests_sql_test_copy"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 10:26:04 >
+# 15:39:56 >
+# 15:39:56 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31776" "--set"
"mapi_usock=/var/tmp/mtest-2478/.s.monetdb.31776" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_copy"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 15:39:56 >
-# builtin opt gdk_dbpath =
/export/scratch1/mk/resultset//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath =
/home/sjoerd/Monet-candidate/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
@@ -17,21 +17,40 @@ stderr of test 'nonutf8` in directory 's
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 33851
-# cmdline opt mapi_usock = /var/tmp/mtest-3524/.s.monetdb.33851
+# cmdline opt mapi_port = 31776
+# cmdline opt mapi_usock = /var/tmp/mtest-2478/.s.monetdb.31776
# cmdline opt monet_prompt =
# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/export/scratch1/mk/resultset//Linux/var/MonetDB/mTests_sql_test_copy
+# cmdline opt gdk_dbpath =
/home/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_copy
# cmdline opt mal_listing = 0
# cmdline opt embedded_r = yes
# cmdline opt gdk_debug = 536870922
-# 10:26:04 >
-# 10:26:04 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-3524" "--port=33851"
-# 10:26:04 >
+# 15:39:57 >
+# 15:39:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-2478" "--port=31776"
+# 15:39:57 >
+MAPI = (monetdb) /var/tmp/mtest-2478/.s.monetdb.31776
+QUERY = insert into nonutf8 values ('zwaar lange golf piek -dal ±10cm vak5');
+
+ copy 2 records into nonutf8 from stdin;
+ zwaar lange golf piek -dal ±10cm vak5
+ ±17 %
+ERROR = !invalid start of UTF-8 sequence
+MAPI = (monetdb) /var/tmp/mtest-2478/.s.monetdb.31776
+QUERY = insert into nonutf8 values ('zwaar lange golf piek -dal ±10cm vak5');
+
+ copy 2 records into nonutf8 from stdin;
+ zwaar lange golf piek -dal ±10cm vak5
+ ±17 %
+
+ select * from nonutf8;
+ERROR = !current transaction is aborted (please ROLLBACK)
+MAPI = (monetdb) /var/tmp/mtest-2478/.s.monetdb.31776
+QUERY = drop table nonutf8;
+ERROR = !current transaction is aborted (please ROLLBACK)
-# 10:26:04 >
-# 10:26:04 > "Done."
-# 10:26:04 >
+# 15:39:57 >
+# 15:39:57 > "Done."
+# 15:39:57 >
diff --git a/sql/test/copy/Tests/nonutf8.stable.out
b/sql/test/copy/Tests/nonutf8.stable.out
--- a/sql/test/copy/Tests/nonutf8.stable.out
+++ b/sql/test/copy/Tests/nonutf8.stable.out
@@ -27,15 +27,6 @@ Ready.
#start transaction;
#create table nonutf8 ( s string);
-#insert into nonutf8 values ('zwaar lange golf piek -dal �10cm vak5');
-[ 1 ]
-#copy 2 records into nonutf8 from stdin;
-#zwaar lange golf piek -dal �10cm vak5
-#�17 %
-[ 2 ]
-#select * from nonutf8;
-#We expect error messages here
-#drop table nonutf8;
#rollback;
# 10:26:04 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
