Changeset: ccce552f8671 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccce552f8671
Modified Files:
sql/common/sql_types.c
sql/common/sql_types.h
Branch: geo
Log Message:
fixed problem with types caused from the merge
diffs (39 lines):
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -105,7 +105,7 @@ static int convert_matrix[EC_MAX][EC_MAX
/* EC_TIME */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 },
/* EC_DATE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 0 },
/* EC_TSTAMP */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 },
-/* EC_GEOM */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0 },
+/* EC_GEOM */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0 },
/* EC_EXTERNAL*/{ 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
diff --git a/sql/common/sql_types.h b/sql/common/sql_types.h
--- a/sql/common/sql_types.h
+++ b/sql/common/sql_types.h
@@ -16,7 +16,7 @@
#include <sql_storage.h>
#include <stream.h>
-#define EC_MAX 16
+#define EC_MAX 17
#define EC_ANY 0
#define EC_TABLE 1
#define EC_BIT 2
@@ -38,10 +38,10 @@
#define EC_DATE 13
#define EC_TIMESTAMP 14
#define EC_TEMP(e) (e==EC_TIME||e==EC_DATE||e==EC_TIMESTAMP)
-#define EC_GEOM 13
-#define EC_GEOMA 14
-#define EC_MBR 15
-#define EC_EXTERNAL 16
+#define EC_GEOM 15
+#define EC_GEOMA 15
+#define EC_MBR 16
+#define EC_EXTERNAL 17
#define EC_TEMP_FRAC(e) (e==EC_TIME||e==EC_TIMESTAMP)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
