MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

Changeset: 73cf43c46847 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=73cf43c46847
Modified Files:
        sql/src/storage/store.c
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (26 lines):

diff -r 68c113f145ec -r 73cf43c46847 clients/src/mapiclient/mclient.c
--- a/clients/src/mapiclient/mclient.c  Mon Oct 18 10:45:37 2010 +0200
+++ b/clients/src/mapiclient/mclient.c  Mon Oct 18 12:40:24 2010 +0200
@@ -80,6 +80,9 @@
 #ifndef S_ISCHR
 #define S_ISCHR(m)     (((m) & S_IFMT) == S_IFCHR)
 #endif
+#ifndef S_ISREG
+#define S_ISREG(m)     (((m) & S_IFMT) == S_IFREG)
+#endif
 
 #ifdef NATIVE_WIN32
 #define strdup _strdup
diff -r 68c113f145ec -r 73cf43c46847 sql/src/storage/store.c
--- a/sql/src/storage/store.c   Mon Oct 18 10:45:37 2010 +0200
+++ b/sql/src/storage/store.c   Mon Oct 18 12:40:24 2010 +0200
@@ -1306,6 +1306,9 @@
        gtrans = tr = create_trans(stk);
 
        if (logger_funcs.log_isnew()) {
+               /* cannot initialize database in readonly mode */
+               if (store == store_ro)
+                       return -1;
                tr = sql_trans_create(stk, NULL, NULL);
        } else {
                first = 0;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list