From: Date: December 19 2008 2:27pm
Subject: bzr push into mysql-5.1-bugteam branch (davi:2743)
List-Archive: http://lists.mysql.com/commits/62098
Message-Id: <20081219132733.0025DEC0FF@skynet.ctb.virtua.com.br>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2743 Davi Arnaut	2008-12-19 [merge]
      Merge before pushing.
added:
  mysql-test/r/innodb_bug38231.result
  mysql-test/r/innodb_bug39438.result
  mysql-test/t/innodb_bug38231.test
  mysql-test/t/innodb_bug39438-master.opt
  mysql-test/t/innodb_bug39438.test
modified:
  mysql-test/lib/mtr_report.pl
  mysql-test/r/innodb-autoinc.result
  mysql-test/r/innodb.result
  mysql-test/suite/binlog/r/binlog_innodb.result
  mysql-test/t/innodb-autoinc.test
  mysql-test/t/innodb.test
  storage/innobase/Makefile.am
  storage/innobase/btr/btr0sea.c
  storage/innobase/buf/buf0lru.c
  storage/innobase/dict/dict0dict.c
  storage/innobase/dict/dict0mem.c
  storage/innobase/handler/ha_innodb.cc
  storage/innobase/handler/ha_innodb.h
  storage/innobase/include/btr0sea.h
  storage/innobase/include/dict0dict.h
  storage/innobase/include/dict0mem.h
  storage/innobase/include/ha_prototypes.h
  storage/innobase/include/lock0lock.h
  storage/innobase/include/row0mysql.h
  storage/innobase/include/sync0sync.ic
  storage/innobase/include/ut0ut.h
  storage/innobase/lock/lock0lock.c
  storage/innobase/os/os0file.c
  storage/innobase/plug.in
  storage/innobase/row/row0mysql.c
  storage/innobase/row/row0sel.c
  storage/innobase/srv/srv0srv.c
  storage/innobase/srv/srv0start.c
  storage/innobase/ut/ut0ut.c

=== modified file 'extra/resolve_stack_dump.c'
--- a/extra/resolve_stack_dump.c	2007-05-10 09:59:39 +0000
+++ b/extra/resolve_stack_dump.c	2008-12-19 10:47:28 +0000
@@ -290,7 +290,8 @@ static void do_resolve()
   char buf[1024], *p;
   while (fgets(buf, sizeof(buf), fp_dump))
   {
-    p = buf;
+    /* skip bracket */
+    p= (p= strchr(buf, '[')) ? p+1 : buf;
     /* skip space */
     while (my_isspace(&my_charset_latin1,*p))
       ++p;