bk commit into 4.1 tree (monty:1.2485)

[monty]

Below is the list of changes that have just been committed into a local
4.1 repository of monty. When monty 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.2485 06/03/30 03:11:37 monty@stripped +3 -0
  Cleanup during review of new pushed code

  tests/mysql_client_test.c
    1.166 06/03/30 03:11:35 monty@stripped +3 -3
    Remove compiler warnings

  strings/ctype-ucs2.c
    1.48 06/03/30 03:11:35 monty@stripped +2 -2
    Simplify code

  sql/ha_heap.cc
    1.60 06/03/30 03:11:35 monty@stripped +7 -11
    Indentation fixes

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-4.1

--- 1.59/sql/ha_heap.cc	2006-01-27 19:44:30 +02:00
+++ 1.60/sql/ha_heap.cc	2006-03-30 03:11:35 +03:00
@@ -480,17 +480,13 @@
       min_key->flag != HA_READ_KEY_EXACT ||
       max_key->flag != HA_READ_AFTER_KEY)
     return HA_POS_ERROR;			// Can only use exact keys
-  else
-  {
-    if (records <= 1)
-      return records;
-    else
-    {
-      /* Assert that info() did run. We need current statistics here. */
-      DBUG_ASSERT(key_stat_version == file->s->key_stat_version);
-      return key->rec_per_key[key->key_parts-1];
-    }
-  }
+
+  if (records <= 1)
+    return records;
+
+  /* Assert that info() did run. We need current statistics here. */
+  DBUG_ASSERT(key_stat_version == file->s->key_stat_version);
+  return key->rec_per_key[key->key_parts-1];
 }
 
 

--- 1.47/strings/ctype-ucs2.c	2006-03-23 12:29:28 +02:00
+++ 1.48/strings/ctype-ucs2.c	2006-03-30 03:11:35 +03:00
@@ -253,8 +253,8 @@
   uint minlen;
 
   /* extra safety to make sure the lengths are even numbers */
-  slen= (slen >> 1) << 1;
-  tlen= (tlen >> 1) << 1;
+  slen= slen & ~(uint) 1;
+  tlen= tlen & ~(uint) 1;
 
   se= s + slen;
   te= t + tlen;

--- 1.165/tests/mysql_client_test.c	2006-03-04 23:38:41 +02:00
+++ 1.166/tests/mysql_client_test.c	2006-03-30 03:11:35 +03:00
@@ -11719,13 +11719,13 @@
   rc= mysql_kill(mysql, mysql_thread_id(mysql));
   DIE_UNLESS(rc==0);
 
-  if (rc= mysql_stmt_execute(prep_stmt))
+  if ((rc= mysql_stmt_execute(prep_stmt)))
   {
-    if (rc= mysql_stmt_reset(prep_stmt))
+    if ((rc= mysql_stmt_reset(prep_stmt)))
       printf("OK!\n");
     else
     {
-      printf("Error!");
+      printf("Error!\n");
       DIE_UNLESS(1==0);      
     }
   }