Prevent potential image overwrite in MySQL query result

1 files changed, 7 insertions, 1 deletions

diff --git a/odb/mysql/statement.cxx b/odb/mysql/statement.cxx
index 4cd6f35..d4e4943 100644
--- a/odb/mysql/statement.cxx
+++ b/odb/mysql/statement.cxx
@@ -146,7 +146,7 @@ namespace odb
     }
 
     select_statement::result select_statement::
-    fetch ()
+    fetch (bool next)
     {
       if (result_version_ != result_.version)
       {
@@ -163,6 +163,12 @@ namespace odb
         result_version_ = result_.version;
       }
 
+      if (!next && rows_ != 0)
+      {
+        assert (cached_);
+        mysql_stmt_data_seek (stmt_, static_cast<my_ulonglong> (rows_ - 1));
+      }
+
       int r (mysql_stmt_fetch (stmt_));
 
       switch (r)