]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#1008] Changed major to version (follow database column names)
authorFrancis Dupont <fdupont@isc.org>
Tue, 3 Dec 2019 09:09:57 +0000 (10:09 +0100)
committerFrancis Dupont <fdupont@isc.org>
Wed, 4 Dec 2019 13:33:09 +0000 (14:33 +0100)
src/lib/mysql/mysql_connection.cc

index 87f1fa35b064164325554c13d5f93ebcde5cc54f..2e4020fa2dd0983ebeed08bc41f20eed58dbb981 100644 (file)
@@ -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.