From 2fcdff1743dd55b3be32eb7f2858316e1f94e8cb Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Wed, 10 Aug 2016 13:37:40 +0200
Subject: [PATCH] 10.2-integration: Add embedded support for st_mysql_data
 structure.

---
 include/mysql.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/mysql.h b/include/mysql.h
index aa5efd3a..425abc59 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -152,10 +152,12 @@ extern unsigned int mariadb_deinitialize_ssl;
   typedef MYSQL_ROWS *MYSQL_ROW_OFFSET;	/* offset to current row */
 
   typedef struct st_mysql_data {
+    MYSQL_ROWS *data;
+    void *embedded_info;
+    MA_MEM_ROOT alloc;
     unsigned long long rows;
     unsigned int fields;
-    MYSQL_ROWS *data;
-    MA_MEM_ROOT alloc;
+    void *extension;
   } MYSQL_DATA;
 
   enum mariadb_com_multi {