Changeset: 28ee594f06a6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/28ee594f06a6
Branch: txtsim-imp
Log Message:
merged with Jun2023
diffs (81 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -150,6 +150,7 @@ macro(monetdb_macro_variables)
set(RHOME "${LIBR_HOME}")
set(HAVE_GEOM ${GEOS_FOUND})
set(HAVE_SHP ${GDAL_FOUND})
+ set(SANITIZER ${SANITIZER})
if(PY3INTEGRATION)
set(HAVE_LIBPY3 "${Python3_NumPy_FOUND}")
diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -124,7 +124,7 @@ OPTmultiplexInline(Client cntxt, MalBlkP
MalBlkPtr mq;
InstrPtr q = NULL, sig;
char buf[1024];
- int i,j,k,m, actions=0;
+ int i,j,k,m;
int refbat=0, retc = p->retc;
bit *upgrade;
str msg;
@@ -279,7 +279,6 @@ OPTmultiplexInline(Client cntxt, MalBlkP
typeChecker(cntxt->usermodule,mq,q,i,TRUE);
if( q->typechk== TYPE_UNKNOWN)
goto terminateMX;
- actions++;
break;
}
/* handle simple upgraded assignments as well */
@@ -296,7 +295,6 @@ OPTmultiplexInline(Client cntxt, MalBlkP
typeChecker(cntxt->usermodule,mq,q,i,TRUE);
if( q->typechk== TYPE_UNKNOWN)
goto terminateMX;
- actions++;
break;
}
}
diff --git a/sql/odbc/tests/Tests/All b/sql/odbc/tests/Tests/All
--- a/sql/odbc/tests/Tests/All
+++ b/sql/odbc/tests/Tests/All
@@ -2,4 +2,4 @@ HAVE_ODBC?ODBCgetInfo
HAVE_ODBC?ODBCmetadata
HAVE_ODBC?ODBCStmtAttr
HAVE_ODBC?ODBCtester
-HAVE_PYODBC?pyodbc-test
+HAVE_PYODBC&!SANITIZER?pyodbc-test
diff --git a/sql/test/BugTracker-2023/Tests/All
b/sql/test/BugTracker-2023/Tests/All
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2023/Tests/All
@@ -0,0 +1,1 @@
+ambiguous-identifiers-7372
diff --git a/sql/test/BugTracker-2023/Tests/ambiguous-identifiers-7372.test
b/sql/test/BugTracker-2023/Tests/ambiguous-identifiers-7372.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2023/Tests/ambiguous-identifiers-7372.test
@@ -0,0 +1,11 @@
+statement ok
+create table test (a INT)
+
+statement error 42000!SELECT: identifier 'a' ambiguous
+select a from test a, test b, test c, test d, test e
+
+statement error 42000!SELECT: identifier 'a' ambiguous
+select a from test a, test c, test d, test e
+
+statement error 42000!SELECT: identifier 'a' ambiguous
+select SUM(a) from test a, test b, test c, test d, test e
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -383,6 +383,7 @@ CONDITIONALS = {
'HAVE_GETENTROPY' : "@HAVE_GETENTROPY_FALSE@",
'NATIVE_WIN32' : "@NATIVE_WIN32_FALSE@",
'NOT_WIN32' : "@NOT_WIN32_FALSE@",
+ 'SANITIZER' : "@SANITIZER_FALSE@",
# unknown at compile time;
# hence, we set them only at runtime in main() below
'KNOWNFAIL' : False, # skip on release branch when not in
testweb
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
