Commit 0156e0d0 authored by unknown's avatar unknown
Browse files

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)
parent f6ffd3a1
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -2816,6 +2816,7 @@ 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;