diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in
index 04a43f2c968..c37e99d7a8c 100644
--- a/include/mysql_version.h.in
+++ b/include/mysql_version.h.in
@@ -11,6 +11,7 @@
 #define PROTOCOL_VERSION		@PROTOCOL_VERSION@
 #define MYSQL_SERVER_VERSION		"@VERSION@"
 #define MYSQL_BASE_VERSION		"mysqld-@MYSQL_BASE_VERSION@"
+#define MARIADB_BASE_VERSION		"mariadb-@MYSQL_BASE_VERSION@"
 #define MYSQL_SERVER_SUFFIX_DEF		"@MYSQL_SERVER_SUFFIX@"
 #define FRM_VER				@DOT_FRM_VERSION@
 #define MYSQL_VERSION_ID		@MYSQL_VERSION_ID@
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 183a269d760..ab7a3198f68 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3014,7 +3014,9 @@ static const char *load_default_groups[]= {
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 "mysql_cluster",
 #endif
-"mysqld","server", MYSQL_BASE_VERSION, 0, 0};
+"mysqld", "server", MYSQL_BASE_VERSION,
+"mariadb", MARIADB_BASE_VERSION,
+0, 0};
 
 #if defined(__WIN__)
 static const int load_default_groups_sz=
diff --git a/sql/scheduler.h b/sql/scheduler.h
index c3610bdc07b..501fdd87bbf 100644
--- a/sql/scheduler.h
+++ b/sql/scheduler.h
@@ -82,7 +82,9 @@ void pool_of_threads_scheduler(scheduler_functions* func);
 #else
 
 #define HAVE_POOL_OF_THREADS 0                  /* For easyer tests */
-#define pool_of_threads_scheduler(A) one_thread_per_connection_scheduler(A)
+#define pool_of_threads_scheduler(A) \
+  one_thread_per_connection_scheduler(A, &max_connections, \
+                                      &connection_count)
 
 class thd_scheduler
 {};