Changeset: 04aafdd2f555 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=04aafdd2f555
Modified Files:
common/utils/msabaoth.c
configure.ag
sql/server/sql_parser.y
Branch: default
Log Message:
Merged from Jul2012
diffs (50 lines):
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -645,8 +645,15 @@ msab_getStatus(sabdb** ret, char *dbname
*/
sdb->state = SABdbInactive;
} else if (fd == -1) {
- /* lock denied, so Mserver is running */
- sdb->state = SABdbRunning;
+ /* lock denied, so mserver is running, see if the
database
+ * has finished starting */
+ snprintf(buf, sizeof(buf), "%s/%s/%s",
+ path, e->d_name, STARTINGFILE);
+ if (stat(buf, &statbuf) == -1) {
+ sdb->state = SABdbRunning;
+ } else {
+ sdb->state = SABdbStarting;
+ }
} else {
/* locking succeed, check for a crash in the uplog */
snprintf(log, sizeof(log), "%s/%s/%s", path, e->d_name,
UPLOGFILE);
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1264,6 +1264,14 @@ case "$YACC" in
if test MONETDB_VERSION_TO_NUMBER(echo $BISON_VER) -lt
MONETDB_VERSION_TO_NUMBER(echo 2.4.3); then
X_CFLAGS="`echo ${X_CFLAGS} | sed -e 's/-Wundef//g'`"
fi
+ if test MONETDB_VERSION_TO_NUMBER(echo $BISON_VER) -lt
MONETDB_VERSION_TO_NUMBER(echo 2.4); then
+ if test "x$enable_jaql" = xyes; then
+ AC_MSG_ERROR([MonetDB/JAQL requires bison
>=2.4])
+ elif test "x$enable_jaql" = xauto; then
+ enable_jaql=no
+ disable_jaql="(MonetDB/JAQL requires bison >=
2.4)"
+ fi
+ fi
;;
*)
if test "x$enable_sql" = xyes; then
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -69,7 +69,6 @@
* UDT
*/
-%define api.pure
%parse-param { mvc *m }
%lex-param { void *m }
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
