bk commit into 5.1 tree (konstantin:1.2092)

[Konstantin Osipov]

Below is the list of changes that have just been committed into a local
5.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.2092 06/02/09 00:21:22 konstantin@stripped +2 -0
  Merge mysql.com:/home/kostja/mysql/tmp_merge1
  into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

  tests/mysql_client_test.c
    1.173 06/02/09 00:21:15 konstantin@stripped +0 -0
    Auto merged

  sql/ha_heap.cc
    1.82 06/02/09 00:21:14 konstantin@stripped +0 -0
    Auto merged

# 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:	oak.local
# Root:	/home/kostja/mysql/mysql-5.1-merge/RESYNC

--- 1.81/sql/ha_heap.cc	2006-02-08 23:52:04 +03:00
+++ 1.82/sql/ha_heap.cc	2006-02-09 00:21:14 +03:00
@@ -73,7 +73,7 @@
 
 ha_heap::ha_heap(TABLE_SHARE *table_arg)
   :handler(&heap_hton, table_arg), file(0), records_changed(0),
-  key_stats_version(0)
+  key_stat_version(0)
 {}
 
 
@@ -559,7 +559,7 @@
     return records;
 
   /* Assert that info() did run. We need current statistics here. */
-  DBUG_ASSERT(key_stats_ok);
+  DBUG_ASSERT(key_stat_version);
   return key->rec_per_key[key->key_parts-1];
 }
 

--- 1.172/tests/mysql_client_test.c	2006-02-08 23:53:37 +03:00
+++ 1.173/tests/mysql_client_test.c	2006-02-09 00:21:15 +03:00
@@ -14697,23 +14697,6 @@
   mysql_close(lmysql);
 }
 
-/* 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);
-}
-
 
 static void test_bug12744()
 {