Changeset: ad4acdf39ed7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad4acdf39ed7
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (41 lines):
diff -r fe63f1111d82 -r ad4acdf39ed7 clients/src/mapiclient/dump.c
--- a/clients/src/mapiclient/dump.c Wed Sep 15 17:10:02 2010 +0200
+++ b/clients/src/mapiclient/dump.c Wed Sep 15 17:40:22 2010 +0200
@@ -342,18 +342,19 @@
return 1;
}
-static char _toupperbuf[64];
-static char *
+static const char *
toUpper(const char *s)
{
+ static char toupperbuf[64];
size_t i;
size_t len = strlen(s);
- if (len > 63)
- len = 63;
+
+ if (len >= sizeof(toupperbuf))
+ return s; /* too long: it's not *that* important */
for (i = 0; i < len; i++)
- _toupperbuf[i] = toupper((int)s[i]);
- _toupperbuf[i] = '\0';
- return(_toupperbuf);
+ toupperbuf[i] = toupper((int)s[i]);
+ toupperbuf[i] = '\0';
+ return toupperbuf;
}
static int dump_column_definition(
diff -r fe63f1111d82 -r ad4acdf39ed7
sql/src/test/BugTracker-2009/Tests/subtraction_between_two_columns.SF-2582389.sql
---
a/sql/src/test/BugTracker-2009/Tests/subtraction_between_two_columns.SF-2582389.sql
Wed Sep 15 17:10:02 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/subtraction_between_two_columns.SF-2582389.sql
Wed Sep 15 17:40:22 2010 +0200
@@ -3,6 +3,6 @@
insert into t2_2582389 values(1, 0.2);
insert into t2_2582389 values(1, 0.4);
-select l.id, r.inst, l.inst, (r.inst - l.inst) as diff from t2_2582389 l,
t2_2582389 r where r.id = l.id order by r.inst limit 2;
+select l.id, r.inst, l.inst, (r.inst - l.inst) as diff from t2_2582389 l,
t2_2582389 r where r.id = l.id order by r.inst, l.inst limit 2;
drop table t2_2582389;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
