bzr push into mysql-trunk branch (marko.makela:3731 to 3732) Bug#13992653

[marko.makela]

 3732 Marko Mäkelä	2012-04-24
      Catch Bug#13992653 a little earlier in debug builds.

    modified:
      storage/innobase/btr/btr0cur.cc
 3731 Sergey Glukhov	2012-04-24
      Bug#13581962 HIGH MEMORY USAGE ATTEMPT, THEN CRASH WITH LONGTEXT, UNION, USER VARIABLE
      In Item_func_signed::fix_length_and_dec max_length is inherited
      from the max length of the argument. It can be huge value in case
      of LONGTEXT, for example, and leads to OOM in some situations.
      The fix is to use the minimum of args[0]->length and max possible
      number of digits for the int type.
     @ mysql-test/r/cast.result
        test case
     @ mysql-test/r/ctype_utf8mb4.result
        test case
     @ mysql-test/t/cast.test
        test case
     @ mysql-test/t/ctype_utf8mb4.test
        test case
     @ sql/item_func.h
        limit max length by MY_INT64_NUM_DECIMAL_DIGITS

    modified:
      mysql-test/r/cast.result
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/t/cast.test
      mysql-test/t/ctype_utf8mb4.test
      sql/item_func.h
=== modified file 'storage/innobase/btr/btr0cur.cc'
--- a/storage/innobase/btr/btr0cur.cc	revid:sergey.glukhov@stripped-7aoc0xp6jejz8hpw
+++ b/storage/innobase/btr/btr0cur.cc	revid:marko.makela@stripped6vg
@@ -5152,6 +5152,7 @@ btr_copy_zblob_prefix(
 				" page %lu space %lu\n",
 				(ulong) fil_page_get_type(bpage->zip.data),
 				(ulong) page_no, (ulong) space_id);
+			ut_ad(0);
 			goto end_of_blob;
 		}
 

No bundle (reason: useless for push emails).