summaryrefslogtreecommitdiff
path: root/include/mysql_version.h.in
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2009-03-18 04:14:22 +0200
committerMichael Widenius <monty@askmonty.org>2009-03-18 04:14:22 +0200
commit4c83c570ed5122bd1f66f62365e4093e2259b226 (patch)
treec52695b9f817e55006435e4c9139cdbcd51a4823 /include/mysql_version.h.in
parentc97f25a02fe4fc4033b285f54663f6fe4ecdcc7c (diff)
downloadmariadb-git-4c83c570ed5122bd1f66f62365e4093e2259b226.tar.gz
Added mariadb and mariadb-version as my.conf option tags
Fixed compiler error when configuring without --lib-event 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
Diffstat (limited to 'include/mysql_version.h.in')
-rw-r--r--include/mysql_version.h.in1
1 files changed, 1 insertions, 0 deletions
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@