Changeset: 05b1d339ff2f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05b1d339ff2f
Modified Files:
configure.ag
monetdb5/mal/mal_linker.c
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 401 to 300 lines):
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -231,12 +231,6 @@
}
"Entry"
{
- "MsmKey" = "8:_334E7A07ED5D4A97860D57F3E76BCAA0"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_387D4731F62A4189926D60105416556E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -261,12 +255,6 @@
}
"Entry"
{
- "MsmKey" = "8:_3B48252F751E4499BB74A438AE4B7E70"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_3D07311C9AD34774AF127D1A385A6A6A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1955,26 +1943,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_334E7A07ED5D4A97860D57F3E76BCAA0"
- {
- "SourcePath" = "8:lib\\monetdb5\\replication.mal"
- "TargetName" = "8:replication.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_387D4731F62A4189926D60105416556E"
{
"SourcePath" = "8:lib\\monetdb5\\opt_dataflow.mal"
@@ -2055,26 +2023,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B48252F751E4499BB74A438AE4B7E70"
- {
- "SourcePath" = "8:lib\\monetdb5\\opt_replication.mal"
- "TargetName" = "8:opt_replication.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3D07311C9AD34774AF127D1A385A6A6A"
{
"SourcePath" = "8:lib\\monetdb5\\opt_accessmode.mal"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -231,12 +231,6 @@
}
"Entry"
{
- "MsmKey" = "8:_334E7A07ED5D4A97860D57F3E76BCAA0"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_387D4731F62A4189926D60105416556E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -261,12 +255,6 @@
}
"Entry"
{
- "MsmKey" = "8:_3B48252F751E4499BB74A438AE4B7E70"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_3D07311C9AD34774AF127D1A385A6A6A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1955,26 +1943,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_334E7A07ED5D4A97860D57F3E76BCAA0"
- {
- "SourcePath" = "8:lib\\monetdb5\\replication.mal"
- "TargetName" = "8:replication.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_387D4731F62A4189926D60105416556E"
{
"SourcePath" = "8:lib\\monetdb5\\opt_dataflow.mal"
@@ -2055,26 +2023,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B48252F751E4499BB74A438AE4B7E70"
- {
- "SourcePath" = "8:lib\\monetdb5\\opt_replication.mal"
- "TargetName" = "8:opt_replication.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3D07311C9AD34774AF127D1A385A6A6A"
{
"SourcePath" = "8:lib\\monetdb5\\opt_accessmode.mal"
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -785,7 +785,8 @@
if (view) {
/* the table is actually a view */
- mnstr_printf(toConsole, "%s\n", view);
+ mnstr_printf(toConsole, "CREATE VIEW \"%s\".\"%s\" AS %s\n",
+ schema, tname, view);
goto doreturn;
}
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1683,7 +1683,7 @@
mnstr_printf(toConsole, "\\t - toggle timer\n");
if (mode == SQL) {
mnstr_printf(toConsole, "\\D table- dumps the table, or the
complete database if none given.\n");
- mnstr_printf(toConsole, "\\d table- describe the table, or the
complete database if none given.\n");
+ mnstr_printf(toConsole, "\\d[Stvsfn]+ [obj] - list database
objects, or describe if obj given\n");
mnstr_printf(toConsole, "\\A - enable auto commit\n");
mnstr_printf(toConsole, "\\a - disable auto commit\n");
}
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -192,7 +192,7 @@
AC_ARG_ENABLE(developer,
AS_HELP_STRING([--enable-developer],
- [enable support for MonetDB development (default=auto)]),
+ [enable support for MonetDB development (default=yes for
development sources)]),
enable_developer=$enableval,
enable_developer=$dft_develop)
@@ -451,7 +451,7 @@
dnl --enable-strict
AC_ARG_ENABLE(strict,
AS_HELP_STRING([--enable-strict],
- [enable strict compiler flags (default=$dft_strict)]),
+ [enable strict compiler flags (default=yes for development
sources)]),
enable_strict=$enableval,
enable_strict=$dft_strict)
dnl Set compiler switches.
@@ -889,7 +889,7 @@
dnl --enable-debug
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],
- [enable full debugging (default=$dft_debug)]),
+ [enable full debugging (default=yes for development sources)]),
enable_debug=$enableval,
enable_debug=$dft_debug)
@@ -940,7 +940,7 @@
dnl --enable-assert
AC_ARG_ENABLE(assert,
AS_HELP_STRING([--enable-assert],
- [enable assertions in the code (default=$dft_assert)]),
+ [enable assertions in the code (default=yes for development
sources)]),
enable_assert=$enableval,
enable_assert=$dft_assert)
@@ -955,7 +955,7 @@
dnl --enable-optimize
AC_ARG_ENABLE(optimize,
AS_HELP_STRING([--enable-optimize],
- [enable extra optimization (default=$dft_optimi)]),
+ [enable extra optimization (default=no)]),
enable_optim=$enableval, enable_optim=$dft_optimi)
AC_MSG_CHECKING([for --enable-optimize])
@@ -2957,6 +2957,14 @@
dnl miscellany
AC_DEFINE(MX_CXX_SUFFIX, "cc", [Suffix for C++ files])
+dnl check dependencies (might need more than just SQL)
+if test x"$enable_sql" = xyes && test x"$enable_monetdb5" != x"yes" ; then
+ AC_MSG_ERROR([sql needs monetdb5]);
+fi
+if test x"$enable_sql" = xauto && test x"$enable_monetdb5" = x"no" ; then
+ enable_sql = no
+fi
+
dnl output
AM_CONDITIONAL(HAVE_MONETDB5, test "x$enable_monetdb5" = xyes -o
"x$enable_monetdb5" = xauto)
AM_CONDITIONAL(HAVE_SQL, test "x$enable_sql" = xyes -o "x$enable_sql" = xauto)
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -118,10 +118,11 @@
* This deals with the case that files are linked together to reduce
* the loading time, while the signatures of the functions are still
* obtained from the source-file MAL script.
-*/
- for(idx =0; idx < lastfile && filesLoaded[idx].handle; idx++){
+ */
+ for (idx =0; idx < lastfile; idx++)
+ if (filesLoaded[idx].handle) {
adr = (MALfcn) dlsym(filesLoaded[idx].handle, fcnname);
- if( adr != NULL) {
+ if (adr != NULL) {
prev = idx;
return adr; /* found it */
}
@@ -166,8 +167,9 @@
{
int idx;
- for (idx = 0; filesLoaded[idx].filename && idx < lastfile; idx++)
- if (strcmp(filesLoaded[idx].filename, modulename) == 0) {
+ for (idx = 0; idx < lastfile; idx++)
+ if (filesLoaded[idx].filename &&
+ strcmp(filesLoaded[idx].filename, modulename) == 0) {
return 1;
}
return 0;
@@ -193,8 +195,9 @@
mode |= RTLD_MEMBER;
#endif
- for (idx = 0; filesLoaded[idx].filename && idx < lastfile; idx++)
- if (strcmp(filesLoaded[idx].filename, filename) == 0)
+ for (idx = 0; idx < lastfile; idx++)
+ if (filesLoaded[idx].filename &&
+ strcmp(filesLoaded[idx].filename, filename) == 0)
/* already loaded */
return MAL_SUCCEED;
@@ -256,17 +259,10 @@
if (handle == NULL) {
errmsg = dlerror();
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
