Merge branch 'fix_module_load_return'

lib/defines.h

@@ -35,7 +35,7 @@
 /*
  * Connection limits.
  */
-#define KR_CONN_RTT_MAX 10000
+#define KR_CONN_RTT_MAX 5000
 
 /*
  * Timers.

lib/module.c

@@ -34,16 +34,14 @@
 
 /** Check ABI version, return error on mismatch. */
 #define ABI_CHECK(m, prefix, symname, required) do { \
-	if ((m)->lib != RTLD_DEFAULT) { \
-		module_api_cb *_api = NULL; \
-		*(void **) (&_api) = load_symbol((m)->lib, (prefix), (symname)); \
-		if (_api == NULL) { \
-			return kr_error(ENOENT); \
-		} \
-		if (_api() != (required)) { \
-			return kr_error(ENOTSUP); \
-		} \
-	}\
+	module_api_cb *_api = NULL; \
+	*(void **) (&_api) = load_symbol((m)->lib, (prefix), (symname)); \
+	if (_api == NULL) { \
+		return kr_error(ENOENT); \
+	} \
+	if (_api() != (required)) { \
+		return kr_error(ENOTSUP); \
+	} \
 } while (0)
 
 /** Load ABI by symbol names. */

lib/rplan.c

@@ -87,8 +87,6 @@ void kr_rplan_deinit(struct kr_rplan *rplan)
 	if (rplan->txn.db != NULL) {
 		kr_cache_txn_abort(&rplan->txn);
 	}
-
-	kr_rplan_init(rplan, rplan->context, rplan->pool);
 }
 
 bool kr_rplan_empty(struct kr_rplan *rplan)