bk commit into 5.0 tree (marko:1.1873) BUG#9526

[Marko Mäkelä]

Below is the list of changes that have just been committed into a local
5.0 repository of marko. When marko 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.1873 05/04/05 15:13:14 marko@stripped +1 -0
  InnoDB: Disable an assertion that fails on old data due to Bug #9526

  innobase/row/row0sel.c
    1.82 05/04/05 15:13:06 marko@stripped +3 -1
    Disable an assertion that fails for old UTF-8 ENUM columns (Bug #9526)

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

--- 1.81/innobase/row/row0sel.c	Mon Apr  4 20:29:11 2005
+++ 1.82/innobase/row/row0sel.c	Tue Apr  5 15:13:06 2005
@@ -2364,7 +2364,9 @@
 
 		ut_a(templ->mbmaxlen > templ->mbminlen
 			|| templ->mysql_col_len == len);
-		ut_a(!templ->mbmaxlen
+		/* The following assertion would fail for old tables
+		containing UTF-8 ENUM columns due to Bug #9526. */
+		ut_ad(!templ->mbmaxlen
 			|| !(templ->mysql_col_len % templ->mbmaxlen));
 		ut_a(len * templ->mbmaxlen >= templ->mysql_col_len);