summaryrefslogtreecommitdiff
path: root/include/service_versions.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-30 12:48:42 +0200
committerSergei Golubchik <serg@mariadb.org>2017-03-30 12:48:42 +0200
commitda4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch)
tree7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /include/service_versions.h
parent9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff)
parenta00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff)
downloadmariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'include/service_versions.h')
-rw-r--r--include/service_versions.h24
1 files changed, 13 insertions, 11 deletions
diff --git a/include/service_versions.h b/include/service_versions.h
index 0f0990d43b3..d79474f1d36 100644
--- a/include/service_versions.h
+++ b/include/service_versions.h
@@ -1,5 +1,5 @@
/* Copyright (c) 2009, 2010, Oracle and/or its affiliates.
- Copyright (c) 2012, 2013, Monty Program Ab
+ Copyright (c) 2012, 2017, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,18 +23,20 @@
#define VERSION_debug_sync 0x1000
#define VERSION_kill_statement 0x1000
+#define VERSION_base64 0x0100
+#define VERSION_encryption 0x0300
+#define VERSION_encryption_scheme 0x0100
+#define VERSION_logger 0x0100
+#define VERSION_my_md5 0x0100
+#define VERSION_my_sha1 0x0101
+#define VERSION_my_sha2 0x0100
#define VERSION_my_snprintf 0x0100
-#define VERSION_thd_alloc 0x0100
-#define VERSION_thd_wait 0x0100
#define VERSION_progress_report 0x0100
-#define VERSION_thd_timezone 0x0100
-#define VERSION_my_sha1 0x0101
-#define VERSION_my_md5 0x0100
-#define VERSION_wsrep 0x0201
-#define VERSION_logger 0x0100
+#define VERSION_thd_alloc 0x0100
#define VERSION_thd_autoinc 0x0100
#define VERSION_thd_error_context 0x0100
+#define VERSION_thd_rnd 0x0100
#define VERSION_thd_specifics 0x0100
-#define VERSION_encryption 0x0300
-#define VERSION_encryption_scheme 0x0100
-
+#define VERSION_thd_timezone 0x0100
+#define VERSION_thd_wait 0x0100
+#define VERSION_wsrep 0x0201