bzr push into mysql-trunk-innodb branch (marko.makela:3099 to 3100)

[marko.makela]

 3100 Marko Mäkelä	2010-05-18
      Merge a change from mysql-5.1-innodb:
      
        ------------------------------------------------------------
        revno: 3468
        revision-id: marko.makela@stripped658-rd00ql7h02ooakh1
        parent: [e-mail]-20100514131050-mkhlvlui1u52irob
        committer: Marko Mäkelä <marko.makela@stripped>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-18 16:06:58 +0300
        message:
          Work around Bug #53750 in innodb_bug48024.test

    modified:
      mysql-test/suite/innodb/t/innodb_bug48024.test
 3099 Jimmy Yang	2010-05-17
      Fix bug #52546, crash on shutdown of plugin with innodb_use_sys_malloc=0.
      
      rb://339, approved by Sunny Bains.

    modified:
      storage/innobase/include/mem0pool.h
      storage/innobase/mem/mem0mem.c
      storage/innobase/mem/mem0pool.c
      storage/innobase/srv/srv0start.c
=== modified file 'mysql-test/suite/innodb/t/innodb_bug48024.test'
--- a/mysql-test/suite/innodb/t/innodb_bug48024.test	revid:jimmy.yang@stripped0517085742-kx3nqxrjbyxk5tkk
+++ b/mysql-test/suite/innodb/t/innodb_bug48024.test	revid:marko.makela@stripped00518131036-fdu5qpmvc75izeqs
@@ -10,6 +10,8 @@ ADD CONSTRAINT FOREIGN KEY(b) REFERENCES
 
 DROP TABLE bug48024,bug48024_b;
 
+# Work around Bug #53750 (failure in mysql-test-run --ps-protocol)
+-- disable_ps_protocol
 delimiter |;
 CREATE TABLE bug48024(a int PRIMARY KEY,b int NOT NULL,KEY(b)) ENGINE=InnoDB;
 CREATE TABLE bug48024_b(b int PRIMARY KEY) ENGINE=InnoDB;

Attachment: [text/bzr-bundle] bzr/[e-mail]