bk commit into 5.0 tree (gluh:1.1869)

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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.1869 05/04/05 14:31:46 gluh@stripped +2 -0
  Code optimization(discussed with Monty)

  BitKeeper/etc/logging_ok
    1.303 05/04/05 14:31:46 gluh@stripped +1 -0
    Logging to logging@stripped accepted

  sql/sql_show.cc
    1.232 05/04/05 14:30:36 gluh@stripped +4 -16
    Code optimization(discussed with Monty)

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/mysql-5.0

--- 1.231/sql/sql_show.cc	Mon Apr  4 12:12:44 2005
+++ 1.232/sql/sql_show.cc	Tue Apr  5 14:30:36 2005
@@ -2334,25 +2334,13 @@
                    "NO" : "YES");
       table->field[6]->store((const char*) pos,
                              strlen((const char*) pos), cs);
-
-      switch (field->type()) {
-      case FIELD_TYPE_TINY_BLOB:
-      case FIELD_TYPE_MEDIUM_BLOB:
-      case FIELD_TYPE_LONG_BLOB:
-      case FIELD_TYPE_BLOB:
-      case FIELD_TYPE_VAR_STRING:
-      case FIELD_TYPE_STRING:
-        if (field->has_charset())
-          table->field[8]->store((longlong) field->representation_length()/
-                                 field->charset()->mbmaxlen);
-        else
-          table->field[8]->store((longlong) field->representation_length());
+      if (field->has_charset())
+      {
+        table->field[8]->store((longlong) field->representation_length()/
+                               field->charset()->mbmaxlen);
         table->field[8]->set_notnull();
         table->field[9]->store((longlong) field->representation_length());
         table->field[9]->set_notnull();
-        break;
-      default:
-        break;
       }
 
       {

--- 1.302/BitKeeper/etc/logging_ok	Mon Apr  4 12:12:32 2005
+++ 1.303/BitKeeper/etc/logging_ok	Tue Apr  5 14:31:46 2005
@@ -59,6 +59,7 @@
 gluh@stripped
 gluh@gluh.(none)
 gluh@stripped
+gluh@stripped
 gordon@stripped
 greg@stripped
 greg@stripped