• Vasil Dimov's avatar
    Manually merge a changeset from mysql-5.1-security: · 7f8627e3
    Vasil Dimov authored
      ------------------------------------------------------------
      revno: 3475
      revision-id: jimmy.yang@oracle.com-20100804103744-vbpeghipkz6pyc9z
      parent: jimmy.yang@oracle.com-20100804101133-c38qqbm0fkwn9jhc
      committer: Jimmy Yang <jimmy.yang@oracle.com>
      branch nick: mysql-5.1-security
      timestamp: Wed 2010-08-04 03:37:44 -0700
      message:
        Fix bug #54678, InnoDB, TRUNCATE, ALTER, I_S SELECT, crash or deadlock
        
        rb://399 approved by Sunny Bains
      modified:
        storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
        storage/innodb_plugin/include/dict0dict.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fdict0dict.h
        storage/innodb_plugin/include/dict0dict.ic 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fdict0dict.ic
        storage/innodb_plugin/row/row0mysql.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frow%2Frow0mysql.c
    7f8627e3
dict0dict.h 44.3 KB