Changeset: 602c6b273559 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=602c6b273559
Added Files:
sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.err
sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.out
Modified Files:
clients/odbc/setup/Makefile.ag
clients/odbc/winsetup/Makefile.ag
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/common/sql_types.c
sql/server/rel_optimizer.c
sql/test/BugTracker-2014/Tests/All
sql/test/BugTracker/Tests/between_with_column.SF-1959410.stable.err
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (48 lines):
diff --git a/clients/odbc/setup/Makefile.ag b/clients/odbc/setup/Makefile.ag
--- a/clients/odbc/setup/Makefile.ag
+++ b/clients/odbc/setup/Makefile.ag
@@ -17,6 +17,8 @@
DEFS = @DEFS@
+INCLUDES = $(ODBC_INCS)
+
lib_MonetODBCs = {
MODULE
SOURCES = drvcfg.c drvcfg.h
diff --git a/clients/odbc/winsetup/Makefile.ag
b/clients/odbc/winsetup/Makefile.ag
--- a/clients/odbc/winsetup/Makefile.ag
+++ b/clients/odbc/winsetup/Makefile.ag
@@ -18,7 +18,8 @@
INCLUDES = \
../include \
../driver \
- -I$(MONETDB_INCLUDEDIR)
+ -I$(MONETDB_INCLUDEDIR) \
+ $(ODBC_INCS)
DEFS = @DEFS@
ODBCLIBS = -lodbc32 -lodbccp32 -lversion -lshlwapi -luser32
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -20,6 +20,7 @@ crash_on_groupby_distinct_serial.Bug-346
local-temp-1.Bug-3468
local-temp-2.Bug-3468
varchar_conversion_crash.Bug-3506
+stringfloatshtcompare.Bug-3512
oid-table-assert.Bug-3514
round-properties.Bug-3515
union_with_subqueries.Bug-3518
diff --git
a/sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.err
b/sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.err
@@ -0,0 +1,1 @@
+We need to determine the correct output.
diff --git
a/sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.out
b/sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.out
@@ -0,0 +1,1 @@
+We need to determine the correct output.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
