Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/btr/btr0cur.c:
  Auto merged
storage/innobase/btr/btr0pcur.c:
  Auto merged
storage/innobase/btr/btr0sea.c:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/buf/buf0flu.c:
  Auto merged
storage/innobase/buf/buf0lru.c:
  Auto merged
storage/innobase/buf/buf0rea.c:
  Auto merged
storage/innobase/data/data0data.c:
  Auto merged
storage/innobase/data/data0type.c:
  Auto merged
storage/innobase/dict/dict0boot.c:
  Auto merged
storage/innobase/dict/dict0crea.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/dict/dict0mem.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/fsp/fsp0fsp.c:
  Auto merged
storage/innobase/ibuf/ibuf0ibuf.c:
  Auto merged
storage/innobase/include/btr0btr.h:
  Auto merged
storage/innobase/include/btr0btr.ic:
  Auto merged
storage/innobase/include/btr0cur.h:
  Auto merged
storage/innobase/include/btr0cur.ic:
  Auto merged
storage/innobase/include/buf0buf.h:
  Auto merged
storage/innobase/include/buf0buf.ic:
  Auto merged
storage/innobase/include/buf0lru.h:
  Auto merged
storage/innobase/include/data0type.h:
  Auto merged
storage/innobase/include/data0type.ic:
  Auto merged
storage/innobase/include/dyn0dyn.h:
  Auto merged
storage/innobase/include/dyn0dyn.ic:
  Auto merged
storage/innobase/include/lock0lock.h:
  Auto merged
storage/innobase/include/log0log.h:
  Auto merged
storage/innobase/include/mach0data.h:
  Auto merged
storage/innobase/include/mach0data.ic:
  Auto merged
storage/innobase/include/mem0mem.ic:
  Auto merged
storage/innobase/include/mtr0log.h:
  Auto merged
storage/innobase/include/mtr0mtr.h:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/page0cur.h:
  Auto merged
storage/innobase/include/page0cur.ic:
  Auto merged
storage/innobase/include/page0page.h:
  Auto merged
storage/innobase/include/page0page.ic:
  Auto merged
storage/innobase/include/read0read.ic:
  Auto merged
storage/innobase/include/rem0rec.h:
  Auto merged
storage/innobase/include/rem0rec.ic:
  Auto merged
storage/innobase/include/row0mysql.h:
  Auto merged
storage/innobase/include/row0sel.ic:
  Auto merged
storage/innobase/include/row0upd.ic:
  Auto merged
storage/innobase/include/sync0rw.ic:
  Auto merged
storage/innobase/include/trx0rseg.ic:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/include/ut0dbg.h:
  Auto merged
storage/innobase/include/ut0rnd.ic:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0log.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/mtr/mtr0log.c:
  Auto merged
storage/innobase/mtr/mtr0mtr.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/page/page0cur.c:
  Auto merged
storage/innobase/page/page0page.c:
  Auto merged
storage/innobase/rem/rem0cmp.c:
  Auto merged
storage/innobase/rem/rem0rec.c:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0purge.c:
  Auto merged
storage/innobase/row/row0row.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/row/row0undo.c:
  Auto merged
storage/innobase/row/row0upd.c:
  Auto merged
storage/innobase/row/row0vers.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/sync/sync0sync.c:
  Auto merged
storage/innobase/trx/trx0rec.c:
  Auto merged
storage/innobase/trx/trx0roll.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/innobase/ut/ut0dbg.c:
  Auto merged

2 files changed, 3 insertions, 3 deletions

diff --git a/storage/innobase/data/data0data.c b/storage/innobase/data/data0data.c
index 5f74dde8710..194213a04e1 100644
--- a/storage/innobase/data/data0data.c
+++ b/storage/innobase/data/data0data.c
@@ -502,7 +502,7 @@ dtuple_convert_big_rec(
 
 	size = rec_get_converted_size(index, entry);
 
-	if (size > 1000000000) {
+	if (UNIV_UNLIKELY(size > 1000000000)) {
 		fprintf(stderr,
 "InnoDB: Warning: tuple size very big: %lu\n", (ulong) size);
 		fputs("InnoDB: Tuple contents: ", stderr);
diff --git a/storage/innobase/data/data0type.c b/storage/innobase/data/data0type.c
index 3fcd666b5a5..d4264ad2926 100644
--- a/storage/innobase/data/data0type.c
+++ b/storage/innobase/data/data0type.c
@@ -39,7 +39,6 @@ column definitions, or records in the insert buffer, we use this
 charset-collation code for them. */
 
 ulint	data_mysql_default_charset_coll		= 99999999;
-ulint	data_mysql_latin1_swedish_charset_coll	= 99999999;
 
 dtype_t		dtype_binary_val = {DATA_BINARY, 0, 0, 0, 0, 0};
 dtype_t* 	dtype_binary 	= &dtype_binary_val;
@@ -64,9 +63,10 @@ dtype_get_at_most_n_mbchars(
 {
 #ifndef UNIV_HOTBACKUP
 	ut_a(data_len != UNIV_SQL_NULL);
-	ut_a(!(prefix_len % dtype->mbmaxlen));
+	ut_ad(!dtype->mbmaxlen || !(prefix_len % dtype->mbmaxlen));
 
 	if (dtype->mbminlen != dtype->mbmaxlen) {
+		ut_a(!(prefix_len % dtype->mbmaxlen));
 		return(innobase_get_at_most_n_mbchars(
 				dtype_get_charset_coll(dtype->prtype),
 				prefix_len, data_len, str));