MonetDB: tracer - Reverted store_init(...)

[Thodoris Zois]

Changeset: 33ec146f1857 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=33ec146f1857
Modified Files:
        sql/server/sql_mvc.c
        sql/storage/sql_storage.h
        sql/storage/store.c
Branch: tracer
Log Message:

Reverted store_init(...)


diffs (53 lines):

diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -99,7 +99,6 @@ bailout:
 int
 mvc_init(int debug, store_type store, int ro, int su, backend_stack stk)
 {
-       (void) debug;
        int first = 0;
        sql_schema *s;
        sql_table *t;
@@ -114,7 +113,7 @@ mvc_init(int debug, store_type store, in
                return -1;
        }
 
-       if ((first = store_init(store, ro, su, stk)) < 0) {
+       if ((first = store_init(debug, store, ro, su, stk)) < 0) {
                CRITICAL(ALL, "Unable to create system tables\n");
                return -1;
        }
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -367,7 +367,7 @@ extern res_table *res_tables_remove(res_
 extern void res_tables_destroy(res_table *results);
 extern res_table *res_tables_find(res_table *results, int res_id);
 
-extern int store_init(store_type store, int readonly, int singleuser, 
backend_stack stk);
+extern int store_init(int debug, store_type store, int readonly, int 
singleuser, backend_stack stk);
 extern void store_exit(void);
 
 extern int store_apply_deltas(bool locked);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1964,7 +1964,7 @@ store_load(void) {
 }
 
 int
-store_init(store_type store, int readonly, int singleuser, backend_stack stk)
+store_init(int debug, store_type store, int readonly, int singleuser, 
backend_stack stk)
 {
        int v = 1;
 
@@ -1990,8 +1990,6 @@ store_init(store_type store, int readonl
                break;
        }
        active_store_type = store;
-       /* CHECK -> Remove debug! */
-       int debug = 0;
        if (!logger_funcs.create ||
            logger_funcs.create(debug, "sql_logs", CATALOG_VERSION*v) != 
LOG_OK) {
                MT_lock_unset(&bs_lock);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list