summaryrefslogtreecommitdiffstats
path: root/src/lib/mysql
diff options
context:
space:
mode:
authorFrancis Dupont <fdupont@isc.org>2019-12-03 10:09:57 +0100
committerFrancis Dupont <fdupont@isc.org>2019-12-04 14:33:09 +0100
commit6813969806677cb66644ee339baafab9573d10d4 (patch)
treeada8c7990ea25f90713fd1106e9befa59ef76e70 /src/lib/mysql
parent[#1008] Addressed comments (diff)
downloadkea-6813969806677cb66644ee339baafab9573d10d4.tar.xz
kea-6813969806677cb66644ee339baafab9573d10d4.zip
[#1008] Changed major to version (follow database column names)
Diffstat (limited to 'src/lib/mysql')
-rw-r--r--src/lib/mysql/mysql_connection.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/mysql/mysql_connection.cc b/src/lib/mysql/mysql_connection.cc
index 87f1fa35b0..2e4020fa2d 100644
--- a/src/lib/mysql/mysql_connection.cc
+++ b/src/lib/mysql/mysql_connection.cc
@@ -251,11 +251,11 @@ MySqlConnection::getVersion(const ParameterMap& parameters) {
MYSQL_BIND bind[2];
memset(bind, 0, sizeof(bind));
- uint32_t major;
+ uint32_t version;
bind[0].buffer_type = MYSQL_TYPE_LONG;
bind[0].is_unsigned = 1;
- bind[0].buffer = &major;
- bind[0].buffer_length = sizeof(major);
+ bind[0].buffer = &version;
+ bind[0].buffer_length = sizeof(version);
uint32_t minor;
bind[1].buffer_type = MYSQL_TYPE_LONG;
@@ -279,7 +279,7 @@ MySqlConnection::getVersion(const ParameterMap& parameters) {
// Discard the statement and its resources
mysql_stmt_close(stmt);
- return (std::make_pair(major, minor));
+ return (std::make_pair(version, minor));
} catch (const std::exception&) {
// Avoid a memory leak on error.