bk commit into 5.0 tree (jan:1.1822)

[jan.lindstrom]

Below is the list of changes that have just been committed into a local
5.0 repository of jan. When jan 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.1822 05/03/16 11:26:35 jan@stripped +1 -0
  DATA_MYSQL_TRUE_VARCHAR can be DATA_VARCHAR, DATA_BINARY, or 
  DATA_VARMYSQL so remove unnecessary condition.
  

  innobase/row/row0sel.c
    1.79 05/03/16 11:26:27 jan@stripped +2 -2
    DATA_MYSQL_TRUE_VARCHAR can be DATA_VARCHAR, DATA_BINARY, or 
    DATA_VARMYSQL so remove unnecessary condition.
    

# 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:	jan
# Host:	hundin.mysql.fi
# Root:	/home/jan/varchar/mysql-5.0

--- 1.78/innobase/row/row0sel.c	Wed Mar 16 10:34:32 2005
+++ 1.79/innobase/row/row0sel.c	Wed Mar 16 11:26:27 2005
@@ -2100,9 +2100,9 @@
 
 		/* Calculate data length and data field total length */
 
-		if (type == DATA_BLOB || ( type == DATA_VARCHAR &&
+		if (type == DATA_BLOB ||
 			dtype_get_mysql_type(dfield_get_type(dfield))
-					== DATA_MYSQL_TRUE_VARCHAR)) {
+					== DATA_MYSQL_TRUE_VARCHAR) {
 
 			/* The key field is a column prefix of a BLOB,
 			TEXT, OR TRUE VARCHAR type column */