List:Commits« Previous MessageNext Message »
From:konstantin Date:March 4 2006 8:05pm
Subject:bk commit into 5.0 tree (konstantin:1.2105) BUG#16144
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 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.2105 06/03/04 23:04:48 konstantin@stripped +2 -0
  Undo the patch for Bug#16144 "mysql_stmt_attr_get type error",
  it breaks binary compatibility. The patch will be left intact
  in 5.1. Warning: this changeset should be null-merged into 5.1.
  A separate commit in order to push into the release clone of 
  5.0.19.

  tests/mysql_client_test.c
    1.178 06/03/04 23:04:39 konstantin@stripped +0 -19
    Undo the patch for Bug#16144

  libmysql/libmysql.c
    1.238 06/03/04 23:04:39 konstantin@stripped +1 -1
    Undo the patch for Bug#16144

# 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-5.0-release

--- 1.237/libmysql/libmysql.c	2006-02-24 19:34:07 +03:00
+++ 1.238/libmysql/libmysql.c	2006-03-04 23:04:39 +03:00
@@ -2822,7 +2822,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;
   case STMT_ATTR_CURSOR_TYPE:
     *(ulong*) value= stmt->flags;

--- 1.177/tests/mysql_client_test.c	2006-02-28 19:42:10 +03:00
+++ 1.178/tests/mysql_client_test.c	2006-03-04 23:04:39 +03:00
@@ -14758,24 +14758,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"
@@ -15137,7 +15119,6 @@
   { "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 }
Thread
bk commit into 5.0 tree (konstantin:1.2105) BUG#16144konstantin4 Mar