summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorian@zim.(none) <>2006-03-27 19:48:44 -0800
committerian@zim.(none) <>2006-03-27 19:48:44 -0800
commit9caff206c2eeec2cfbcc4aebca60c4c1fe69b8f9 (patch)
treebfe4957858d6f08b9e8ccca1d102b7fa07b06d7c /include
parent1ec1587cd3749f6ab41c57a1c766287851ce0480 (diff)
parent34b54fa83c65ee0bb7000548f41c6359d58b82d1 (diff)
downloadmariadb-git-9caff206c2eeec2cfbcc4aebca60c4c1fe69b8f9.tar.gz
Merge zim.(none):/home/ian/workspace/mysql-5.0
into zim.(none):/home/ian/workspace/mysql-5.1-new Updated bug message in disabled file -Brian
Diffstat (limited to 'include')
-rw-r--r--include/mysql.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h
index 303cb2af4f5..925a4525378 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -287,8 +287,10 @@ typedef struct st_mysql
from mysql_stmt_close if close had to cancel result set of this object.
*/
my_bool *unbuffered_fetch_owner;
+#if defined(EMBEDDED_LIBRARY) || defined(EMBEDDED_LIBRARY_COMPATIBLE) || MYSQL_VERSION_ID >= 50100
/* needed for embedded server - no net buffer to store the 'info' */
char *info_buffer;
+#endif
} MYSQL;
typedef struct st_mysql_res {