maria-developers team mailing list archive

[Michael Widenius <monty@xxxxxxxxxxxx>]

#At lp:maria based on revid:knielsen@xxxxxxxxxxxxxxx-20090313133154-0qas21in74uxdtk8

 2683 Michael Widenius	2009-03-18
      Added mariadb and mariadb-version as my.conf option tags
      Fixed compiler error when configuring without --lib-event
      modified:
        include/mysql_version.h.in
        sql/mysqld.cc
        sql/scheduler.h

per-file messages:
  include/mysql_version.h.in
    Added mariadb-'version' as a my.cnf option tag for mysqld
  sql/mysqld.cc
    Added mariadb and mariadb-version as my.conf option tags
=== modified file 'include/mysql_version.h.in'
--- a/include/mysql_version.h.in	2007-09-13 14:19:46 +0000
+++ b/include/mysql_version.h.in	2009-03-18 02:14:22 +0000
@@ -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@

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-03-13 13:31:54 +0000
+++ b/sql/mysqld.cc	2009-03-18 02:14:22 +0000
@@ -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=

=== modified file 'sql/scheduler.h'
--- a/sql/scheduler.h	2009-03-12 22:27:35 +0000
+++ b/sql/scheduler.h	2009-03-18 02:14:22 +0000
@@ -82,7 +82,9 @@ void pool_of_threads_scheduler(scheduler
 #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
 {};