summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <georg@lmy002.wdf.sap.corp>2006-03-21 22:02:36 +0100
committerunknown <georg@lmy002.wdf.sap.corp>2006-03-21 22:02:36 +0100
commit6b8755de95ee0212d9b0a719bd9578930af59d22 (patch)
tree412dff12c4deeeaf158f73dccb732a8a3b2d0748 /libmysql
parenta08262523fa2e8d9e2e9497e339f3411eeccd71c (diff)
downloadmariadb-git-6b8755de95ee0212d9b0a719bd9578930af59d22.tar.gz
fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163)
(approved by kostja) libmysql/libmysql.c: fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163) (approved by kostja)
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 93ae8c3cdd0..009a12574ce 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -2816,10 +2816,11 @@ my_bool STDCALL mysql_stmt_attr_get(MYSQL_STMT *stmt,
{
switch (attr_type) {
case STMT_ATTR_UPDATE_MAX_LENGTH:
+ *(my_bool*) value= stmt->update_max_length;
break;
case STMT_ATTR_CURSOR_TYPE:
*(ulong*) value= stmt->flags;
- break;
+ break;
case STMT_ATTR_PREFETCH_ROWS:
*(ulong*) value= stmt->prefetch_rows;
break;