diff --git a/src/common/Database/QueryResult.cpp b/src/common/Database/QueryResult.cpp
index 3c4c7a739..92dbe6943 100644
--- a/src/common/Database/QueryResult.cpp
+++ b/src/common/Database/QueryResult.cpp
@@ -186,7 +186,7 @@ bool PreparedResultSet::_NextRow()
 }
 
 #ifdef ELUNA
-char* ResultSet::GetFieldName(uint32 index) const
+std::string ResultSet::GetFieldName(uint32 index) const
 {
     ASSERT(index < _fieldCount);
     return _fields[index].name;
diff --git a/src/common/Database/QueryResult.h b/src/common/Database/QueryResult.h
index 732d82f76..3a7db4573 100644
--- a/src/common/Database/QueryResult.h
+++ b/src/common/Database/QueryResult.h
@@ -32,7 +32,7 @@ class ResultSet
         uint64 GetRowCount() const { return _rowCount; }
         uint32 GetFieldCount() const { return _fieldCount; }
 #ifdef ELUNA
-        char* GetFieldName(uint32 index) const;
+        std::string GetFieldName(uint32 index) const;
 #endif
         Field* Fetch() const { return _currentRow; }
         const Field & operator [] (uint32 index) const