diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-08-13 15:52:11 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-08-13 15:52:11 +0300 |
| commit | 7f8627e36bd77bf418dbec50f10566d5917d3a1c (patch) | |
| tree | 37d4cf0013ce9d7a0ab3cf7b257941ef63812620 /sql/init.h | |
| parent | 5ecd192004486cc6499640ff45fea88427d6ae39 (diff) | |
| download | mariadb-git-7f8627e36bd77bf418dbec50f10566d5917d3a1c.tar.gz | |
Manually merge a changeset from mysql-5.1-security:
------------------------------------------------------------
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
Diffstat (limited to 'sql/init.h')
0 files changed, 0 insertions, 0 deletions