Changeset: cbd641efceb9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cbd641efceb9
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapilib/mapi.c
clients/odbc/driver/ODBCUtil.h
clients/odbc/driver/SQLColumnPrivileges.c
clients/odbc/driver/SQLColumns.c
clients/odbc/driver/SQLConnect.c
clients/odbc/driver/SQLForeignKeys.c
clients/odbc/driver/SQLPrimaryKeys.c
clients/odbc/driver/SQLProcedureColumns.c
clients/odbc/driver/SQLProcedures.c
clients/odbc/driver/SQLSpecialColumns.c
clients/odbc/driver/SQLStatistics.c
clients/odbc/driver/SQLTablePrivileges.c
clients/odbc/driver/SQLTables.c
common/utils/mcrypt.c
gdk/gdk_bbp.c
gdk/gdk_bbp.h
gdk/gdk_heap.c
gdk/gdk_private.h
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system_private.h
gdk/gdk_utils.c
gdk/gdk_utils.h
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_session.c
monetdb5/modules/kernel/alarm.c
monetdb5/modules/kernel/alarm.mal
monetdb5/modules/mal/clients.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_gencode.h
sql/backends/monet5/sql_scenario.c
sql/storage/sql_storage.h
sql/storage/store.c
tools/merovingian/daemon/controlrunner.c
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: mdbl-mal
Log Message:
Merge with default
diffs (truncated from 2735 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -513,9 +513,7 @@ Ready.
[ "aggr", "variancep", "command aggr.variancep(b:bat[:sht],
g:bat[:oid], e:bat[:any_1]):bat[:dbl] ", "AGGRvariancep3_dbl;", "Grouped
tail variance (population/biased) on sht" ]
[ "aggr", "variancep", "command aggr.variancep(b:bat[:any_2]):dbl ",
"ALGvariancep;", "Gives the variance of all tail values" ]
[ "alarm", "ctime", "unsafe command alarm.ctime():str ",
"ALARMctime;", "Return the current time as a C-time string." ]
-[ "alarm", "epilogue", "command alarm.epilogue():void ",
"ALARMepilogue;", "Finalize alarm module." ]
[ "alarm", "epoch", "unsafe command alarm.epoch():int ",
"ALARMepoch;", "Return the current time as UNIX epoch." ]
-[ "alarm", "prelude", "command alarm.prelude():void ",
"ALARMprelude;", "Initialize alarm module." ]
[ "alarm", "sleep", "unsafe command alarm.sleep(secs:int):void ",
"ALARMsleep;", "Sleep a few seconds" ]
[ "alarm", "time", "unsafe command alarm.time():int ", "ALARMtime;",
"Return time in milliseconds." ]
[ "alarm", "usec", "unsafe command alarm.usec():lng ", "ALARMusec;",
"Return time in microseconds." ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -617,9 +617,7 @@ Ready.
[ "aggr", "variancep", "command aggr.variancep(b:bat[:sht],
g:bat[:oid], e:bat[:any_1]):bat[:dbl] ", "AGGRvariancep3_dbl;", "Grouped
tail variance (population/biased) on sht" ]
[ "aggr", "variancep", "command aggr.variancep(b:bat[:any_2]):dbl ",
"ALGvariancep;", "Gives the variance of all tail values" ]
[ "alarm", "ctime", "unsafe command alarm.ctime():str ",
"ALARMctime;", "Return the current time as a C-time string." ]
-[ "alarm", "epilogue", "command alarm.epilogue():void ",
"ALARMepilogue;", "Finalize alarm module." ]
[ "alarm", "epoch", "unsafe command alarm.epoch():int ",
"ALARMepoch;", "Return the current time as UNIX epoch." ]
-[ "alarm", "prelude", "command alarm.prelude():void ",
"ALARMprelude;", "Initialize alarm module." ]
[ "alarm", "sleep", "unsafe command alarm.sleep(secs:int):void ",
"ALARMsleep;", "Sleep a few seconds" ]
[ "alarm", "time", "unsafe command alarm.time():int ", "ALARMtime;",
"Return time in milliseconds." ]
[ "alarm", "usec", "unsafe command alarm.usec():lng ", "ALARMusec;",
"Return time in microseconds." ]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -182,7 +182,7 @@ void BATtseqbase(BAT *b, oid o);
void BATundo(BAT *b);
BAT *BATunique(BAT *b, BAT *s);
BBPrec *BBP[N_BBPINIT];
-void BBPaddfarm(const char *dirname, int rolemask);
+gdk_return BBPaddfarm(const char *dirname, int rolemask);
void BBPclear(bat bid);
BAT *BBPdescriptor(bat b);
int BBPfix(bat b);
@@ -255,7 +255,7 @@ bool GDKgetenv_istrue(const char *name);
bool GDKgetenv_isyes(const char *name);
gdk_return GDKgetsem(int sem_id, int count, int *semid);
gdk_return GDKgetsemval(int sem_id, int number, int *semval);
-bool GDKinit(opt *set, int setlen);
+gdk_return GDKinit(opt *set, int setlen);
void *GDKinitmmap(size_t id, size_t size, size_t *return_size);
BAT *GDKkey;
ATOMIC_TYPE volatile GDKlockcnt;
@@ -277,7 +277,7 @@ void *GDKrealloc(void *pold, size_t size
void GDKregister(MT_Id pid);
gdk_return GDKreleasemmap(void *ptr, size_t size, size_t id);
gdk_return GDKreleasesem(int sem_id);
-void GDKreset(int status, int exit);
+void GDKreset(int status);
gdk_return GDKsetenv(const char *name, const char *value);
void GDKsetmallocsuccesscount(lng count);
ssize_t GDKstrFromStr(unsigned char *restrict dst, const unsigned char
*restrict src, ssize_t len);
@@ -698,13 +698,9 @@ str AGGRsum3_sht(bat *retval, const bat
str AGGRvariance3_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
str AGGRvariancep3_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
str ALARMctime(str *res);
-str ALARMepilogue(void *ret);
str ALARMepoch(int *res);
-str ALARMprelude(void *ret);
-str ALARMsetalarm(void *res, int *secs, str *action);
str ALARMsleep(void *res, int *secs);
str ALARMtime(int *res);
-str ALARMtimers(bat *res, bat *actions);
str ALARMusec(lng *ret);
str ALGbandjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat
*slid, const bat *srid, const void *low, const void *high, const bit *li, const
bit *hi, const lng *estimate);
str ALGcard(lng *result, const bat *bid);
@@ -2374,7 +2370,7 @@ MT_Lock mal_contextLock;
MT_Lock mal_copyLock;
void mal_dataflow_reset(void) __attribute__((__visibility__("hidden")));
MT_Lock mal_delayLock;
-void mal_exit(void);
+void mal_exit(int status);
void mal_factory_reset(void) __attribute__((__visibility__("hidden")));
int mal_init(void);
void mal_instruction_reset(void);
@@ -2453,7 +2449,7 @@ char *msab_registerStop(void);
char *msab_retreatScenario(const char *lang);
char *msab_serialise(char **ret, const sabdb *db);
char *msab_wildRetreat(void);
-void mserver_reset(int exit);
+void mserver_reset(void);
str mtimeRef;
str mulRef;
str multicolumnRef;
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -2646,6 +2646,13 @@ mapi_reconnect(Mapi mid)
return mapi_setError(mid, buf,
"mapi_reconnect", MERROR);
}
+ if (pwdhash == NULL) {
+ snprintf(buf, sizeof(buf), "allocation failure
or unknown hash '%.100s'",
+ serverhash);
+ close_connection(mid);
+ return mapi_setError(mid, buf,
"mapi_reconnect", MERROR);
+ }
+
free(mid->password);
mid->password = malloc(1 + strlen(pwdhash) + 1);
sprintf(mid->password, "\1%s", pwdhash);
diff --git a/clients/odbc/driver/ODBCUtil.h b/clients/odbc/driver/ODBCUtil.h
--- a/clients/odbc/driver/ODBCUtil.h
+++ b/clients/odbc/driver/ODBCUtil.h
@@ -102,7 +102,7 @@ extern char *dupODBCstring(const SQLCHAR
extern SQLCHAR *ODBCwchar2utf8(const SQLWCHAR *s, SQLLEN length, const char
**errmsg);
extern const char *ODBCutf82wchar(const SQLCHAR *s, SQLINTEGER length,
SQLWCHAR *buf, SQLLEN buflen, SQLSMALLINT *buflenout, size_t *consumed);
-#define fixWcharIn(ws, wsl, t, s, errfunc, hdl, exit) \
+#define fixWcharIn(ws, wsl, t, s, errfunc, hdl, bailout) \
do { \
const char *e; \
(s) = (t *) ODBCwchar2utf8((ws), (wsl), &e); \
@@ -111,7 +111,7 @@ extern const char *ODBCutf82wchar(const
errfunc((hdl), \
strcmp(e, "Memory allocation error") == 0 ? \
"HY001" : "HY000", e, 0); \
- exit; \
+ bailout; \
} \
} while (0)
#define fixWcharOut(r, s, sl, ws, wsl, wslp, cw, errfunc, hdl) \
diff --git a/clients/odbc/driver/SQLColumnPrivileges.c
b/clients/odbc/driver/SQLColumnPrivileges.c
--- a/clients/odbc/driver/SQLColumnPrivileges.c
+++ b/clients/odbc/driver/SQLColumnPrivileges.c
@@ -315,13 +315,13 @@ SQLColumnPrivilegesW(SQLHSTMT StatementH
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(TableName, NameLength3, SQLCHAR, table,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(ColumnName, NameLength4, SQLCHAR, column,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBColumnPrivileges(stmt,
catalog, SQL_NTS,
@@ -329,7 +329,7 @@ SQLColumnPrivilegesW(SQLHSTMT StatementH
table, SQL_NTS,
column, SQL_NTS);
- exit:
+ bailout:
if (catalog)
free(catalog);
if (schema)
diff --git a/clients/odbc/driver/SQLColumns.c b/clients/odbc/driver/SQLColumns.c
--- a/clients/odbc/driver/SQLColumns.c
+++ b/clients/odbc/driver/SQLColumns.c
@@ -361,13 +361,13 @@ SQLColumnsW(SQLHSTMT StatementHandle,
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(TableName, NameLength3, SQLCHAR, table,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(ColumnName, NameLength4, SQLCHAR, column,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBColumns(stmt,
catalog, SQL_NTS,
@@ -375,7 +375,7 @@ SQLColumnsW(SQLHSTMT StatementHandle,
table, SQL_NTS,
column, SQL_NTS);
- exit:
+ bailout:
if (catalog)
free(catalog);
if (schema)
diff --git a/clients/odbc/driver/SQLConnect.c b/clients/odbc/driver/SQLConnect.c
--- a/clients/odbc/driver/SQLConnect.c
+++ b/clients/odbc/driver/SQLConnect.c
@@ -332,11 +332,11 @@ SQLConnectW(SQLHDBC ConnectionHandle,
clearDbcErrors(dbc);
fixWcharIn(ServerName, NameLength1, SQLCHAR, ds,
- addDbcError, dbc, goto exit);
+ addDbcError, dbc, goto bailout);
fixWcharIn(UserName, NameLength2, SQLCHAR, uid,
- addDbcError, dbc, goto exit);
+ addDbcError, dbc, goto bailout);
fixWcharIn(Authentication, NameLength3, SQLCHAR, pwd,
- addDbcError, dbc, goto exit);
+ addDbcError, dbc, goto bailout);
rc = MNDBConnect(dbc,
ds, SQL_NTS,
@@ -344,7 +344,7 @@ SQLConnectW(SQLHDBC ConnectionHandle,
pwd, SQL_NTS,
NULL, 0, NULL);
- exit:
+ bailout:
if (ds)
free(ds);
if (uid)
diff --git a/clients/odbc/driver/SQLForeignKeys.c
b/clients/odbc/driver/SQLForeignKeys.c
--- a/clients/odbc/driver/SQLForeignKeys.c
+++ b/clients/odbc/driver/SQLForeignKeys.c
@@ -389,23 +389,23 @@ SQLForeignKeysW(SQLHSTMT StatementHandle
clearStmtErrors(stmt);
fixWcharIn(PKCatalogName, NameLength1, SQLCHAR,
- PKcatalog, addStmtError, stmt, goto exit);
+ PKcatalog, addStmtError, stmt, goto bailout);
fixWcharIn(PKSchemaName, NameLength2, SQLCHAR,
- PKschema, addStmtError, stmt, goto exit);
+ PKschema, addStmtError, stmt, goto bailout);
fixWcharIn(PKTableName, NameLength3, SQLCHAR,
- PKtable, addStmtError, stmt, goto exit);
+ PKtable, addStmtError, stmt, goto bailout);
fixWcharIn(FKCatalogName, NameLength4, SQLCHAR,
- FKcatalog, addStmtError, stmt, goto exit);
+ FKcatalog, addStmtError, stmt, goto bailout);
fixWcharIn(FKSchemaName, NameLength5, SQLCHAR,
- FKschema, addStmtError, stmt, goto exit);
+ FKschema, addStmtError, stmt, goto bailout);
fixWcharIn(FKTableName, NameLength6, SQLCHAR,
- FKtable, addStmtError, stmt, goto exit);
+ FKtable, addStmtError, stmt, goto bailout);
rc = MNDBForeignKeys(stmt, PKcatalog, SQL_NTS, PKschema, SQL_NTS,
PKtable, SQL_NTS, FKcatalog, SQL_NTS,
FKschema, SQL_NTS, FKtable, SQL_NTS);
- exit:
+ bailout:
if (PKcatalog)
free(PKcatalog);
if (PKschema)
diff --git a/clients/odbc/driver/SQLPrimaryKeys.c
b/clients/odbc/driver/SQLPrimaryKeys.c
--- a/clients/odbc/driver/SQLPrimaryKeys.c
+++ b/clients/odbc/driver/SQLPrimaryKeys.c
@@ -255,18 +255,18 @@ SQLPrimaryKeysW(SQLHSTMT StatementHandle
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(TableName, NameLength3, SQLCHAR, table,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBPrimaryKeys(stmt,
catalog, SQL_NTS,
schema, SQL_NTS,
table, SQL_NTS);
- exit:
+ bailout:
if (catalog)
free(catalog);
if (schema)
diff --git a/clients/odbc/driver/SQLProcedureColumns.c
b/clients/odbc/driver/SQLProcedureColumns.c
--- a/clients/odbc/driver/SQLProcedureColumns.c
+++ b/clients/odbc/driver/SQLProcedureColumns.c
@@ -363,13 +363,13 @@ SQLProcedureColumnsW(SQLHSTMT StatementH
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(ProcName, NameLength3, SQLCHAR, proc,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(ColumnName, NameLength4, SQLCHAR, column,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBProcedureColumns(stmt,
catalog, SQL_NTS,
@@ -377,7 +377,7 @@ SQLProcedureColumnsW(SQLHSTMT StatementH
proc, SQL_NTS,
column, SQL_NTS);
- exit:
+ bailout:
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
