From 0156e0d0a931c9a6fda6a176d619bc084cc2b7de Mon Sep 17 00:00:00 2001
From: unknown <georg@lmy002.wdf.sap.corp>
Date: Tue, 21 Mar 2006 22:02:36 +0100
Subject: [PATCH] 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)
---
 libmysql/libmysql.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;