Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/merge-5.0

libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

libmysql/libmysql.c

@@ -2822,7 +2822,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;
+    *(unsigned long *) value= stmt->update_max_length;
     break;
   case STMT_ATTR_CURSOR_TYPE:
     *(ulong*) value= stmt->flags;

tests/mysql_client_test.c

@@ -14758,24 +14758,6 @@ static void test_bug16143()
 }
 
 
-/* Bug #16144: mysql_stmt_attr_get type error */
-
-static void test_bug16144()
-{
-  const my_bool flag_orig= (my_bool) 0xde;
-  my_bool flag= flag_orig;
-  MYSQL_STMT *stmt;
-  myheader("test_bug16144");
-
-  /* Check that attr_get returns correct data on little and big endian CPUs */
-  stmt= mysql_stmt_init(mysql);
-  mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void*) &flag);
-  mysql_stmt_attr_get(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (void*) &flag);
-  DIE_UNLESS(flag == flag_orig);
-
-  mysql_stmt_close(stmt);
-}
-
 /*
   Bug #15613: "libmysqlclient API function mysql_stmt_prepare returns wrong
   field length"
@@ -15137,7 +15119,6 @@ static struct my_tests_st my_tests[]= {
   { "test_opt_reconnect", test_opt_reconnect },
   { "test_bug12744", test_bug12744 },
   { "test_bug16143", test_bug16143 },
-  { "test_bug16144", test_bug16144 },
   { "test_bug15613", test_bug15613 },
   { "test_bug14169", test_bug14169 },
   { 0, 0 }