summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMikael Ronström <mikael@dator9>2011-05-12 14:29:32 +0200
committerMikael Ronström <mikael@dator9>2011-05-12 14:29:32 +0200
commit43c55e9a01fed3babab6e53eac2aed388f3ed2dc (patch)
treeb38b221786a2d3d9fc1ff6572ad859f7aeacde27 /include
parent385551271556a8a4f1c9b669a91cb08adf33a89f (diff)
parent30265fd178745430101cfe6e15e02fa3dbc28797 (diff)
downloadmariadb-git-43c55e9a01fed3babab6e53eac2aed388f3ed2dc.tar.gz
merge
Diffstat (limited to 'include')
-rw-r--r--include/mysql.h4
-rw-r--r--include/mysql.h.pp3
2 files changed, 5 insertions, 2 deletions
diff --git a/include/mysql.h b/include/mysql.h
index d3b24f0198a..1966caefdc1 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -573,6 +573,8 @@ typedef struct st_mysql_bind
} MYSQL_BIND;
+struct st_mysql_stmt_extension;
+
/* statement handler */
typedef struct st_mysql_stmt
{
@@ -618,7 +620,7 @@ typedef struct st_mysql_stmt
metadata fields when doing mysql_stmt_store_result.
*/
my_bool update_max_length;
- void *extension;
+ struct st_mysql_stmt_extension *extension;
} MYSQL_STMT;
enum enum_stmt_attr_type
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index 169a8b30e2b..15ec563dfc2 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -512,6 +512,7 @@ typedef struct st_mysql_bind
my_bool is_null_value;
void *extension;
} MYSQL_BIND;
+struct st_mysql_stmt_extension;
typedef struct st_mysql_stmt
{
MEM_ROOT mem_root;
@@ -541,7 +542,7 @@ typedef struct st_mysql_stmt
unsigned char bind_result_done;
my_bool unbuffered_fetch_cancelled;
my_bool update_max_length;
- void *extension;
+ struct st_mysql_stmt_extension *extension;
} MYSQL_STMT;
enum enum_stmt_attr_type
{