Merge of patch lp:~ahiguti100/maria/handlersocket-fix-78 by Akira Higuchi

A bugfix of HandlerSocket is not applied to mariadb yet

1 files changed, 1 insertions, 1 deletions

diff --git a/plugin/handler_socket/handlersocket/database.cpp b/plugin/handler_socket/handlersocket/database.cpp
index 311eec55fa8..beb28ef708c 100644
--- a/plugin/handler_socket/handlersocket/database.cpp
+++ b/plugin/handler_socket/handlersocket/database.cpp
@@ -658,7 +658,7 @@ dbcontext::cmd_insert_internal(dbcallback_i& cb, const prep_stmt& pst,
   empty_record(table);
   memset(buf, 0, table->s->null_bytes); /* clear null flags */
   const prep_stmt::fields_type& rf = pst.get_ret_fields();
-  const size_t n = rf.size();
+  const size_t n = std::min(rf.size(), fvalslen);
   for (size_t i = 0; i < n; ++i) {
     uint32_t fn = rf[i];
     Field *const fld = table->field[fn];