From: Date: October 18 2005 2:23pm
Subject: bk commit into 5.0 tree (ramil:1.2012) BUG#14064
List-Archive: http://lists.mysql.com/internals/31212
X-Bug: 14064
Message-Id: <200510181223.j9ICNRfq049011@myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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.2012 05/10/18 17:23:18 ramil@stripped +1 -0
  Fix for bug #14064: information_schema test fails on opnsrv6c.

  sql/sql_show.cc
    1.293 05/10/18 17:22:59 ramil@stripped +3 -3
    1. Use Field_longlong::store(longlong nr, bool unsigned_val) for ulonglong values
       instead of Field_longlong::store(double nr).
    2. CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH fields filing order fixed (8 <-> 9).

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-5.0

--- 1.292/sql/sql_show.cc	2005-10-14 19:12:40 +05:00
+++ 1.293/sql/sql_show.cc	2005-10-18 17:22:59 +05:00
@@ -2561,9 +2561,9 @@
     {
       longlong c_octet_len= is_blob ? (longlong) field->max_length() :
         (longlong) field->max_length()/field->charset()->mbmaxlen;
-      table->field[8]->store(c_octet_len, TRUE);
+      table->field[8]->store((longlong) field->max_length(), TRUE);
       table->field[8]->set_notnull();
-      table->field[9]->store((longlong) field->max_length());
+      table->field[9]->store(c_octet_len, TRUE);
       table->field[9]->set_notnull();
     }
 
@@ -2604,7 +2604,7 @@
 
     if (field_length >= 0)
     {
-      table->field[10]->store((longlong) field_length);
+      table->field[10]->store((longlong) field_length, TRUE);
       table->field[10]->set_notnull();
     }
     if (decimals >= 0)