From: Date: March 4 2006 10:39pm
Subject: bk commit into 4.1 tree (konstantin:1.2459) BUG#16144
List-Archive: http://lists.mysql.com/commits/3472
X-Bug: 16144
Message-Id: <20060304213903.8A9A472C8@dragonfly.local>

Below is the list of changes that have just been committed into a local
4.1 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2459 06/03/05 00:38:54 konstantin@stripped +2 -0
  Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":
  it breaks binary compatibility. The patch will be left intact
  in 5.1.

  tests/mysql_client_test.c
    1.165 06/03/05 00:38:41 konstantin@stripped +0 -20
    Revert the changeset for Bug#16144: it breaks binary compatibility.

  libmysql/libmysql.c
    1.301 06/03/05 00:38:40 konstantin@stripped +1 -1
    Revert the changeset for Bug#16144: it breaks binary compatibility.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-4.1-root

--- 1.300/libmysql/libmysql.c	2006-02-01 22:35:11 +03:00
+++ 1.301/libmysql/libmysql.c	2006-03-05 00:38:40 +03:00
@@ -2733,7 +2733,7 @@
 {
   switch (attr_type) {
   case STMT_ATTR_UPDATE_MAX_LENGTH:
-    *(my_bool*) value= stmt->update_max_length;
+    *(unsigned long *) value= stmt->update_max_length;
     break;
   default:
     return TRUE;

--- 1.164/tests/mysql_client_test.c	2006-02-01 22:35:11 +03:00
+++ 1.165/tests/mysql_client_test.c	2006-03-05 00:38:41 +03:00
@@ -11784,25 +11784,6 @@
 }
 
 
-/* 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"
@@ -12089,7 +12070,6 @@
   { "test_bug12001", test_bug12001 },
   { "test_bug11718", test_bug11718 },
   { "test_bug12925", test_bug12925 },
-  { "test_bug16144", test_bug16144 },
   { "test_bug15613", test_bug15613 },
   { 0, 0 }
 };