diff options
| author | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-11-06 20:41:06 +0200 |
|---|---|---|
| committer | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-11-06 20:41:06 +0200 |
| commit | cb9af6f8a1947a6b951ea0f455f9847c9198a797 (patch) | |
| tree | 6e680b3af2ca5f301d426f9f04d61ffbebf74a59 /sql/sql_cache.h | |
| parent | febb420146bb64b20302c92e796c35a124dd1378 (diff) | |
| parent | 6957e84ec67a3e3e39b44ae7bca46d23bf3eae68 (diff) | |
| download | mariadb-git-cb9af6f8a1947a6b951ea0f455f9847c9198a797.tar.gz | |
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
into koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
mysql-test/suite/binlog/r/binlog_killed.result:
Auto merged
mysql-test/suite/binlog/t/binlog_killed.test:
Auto merged
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
Auto merged
mysql-test/suite/rpl/t/rpl_temporary.test:
manual merge
sql/log.cc:
manual merge
Diffstat (limited to 'sql/sql_cache.h')
0 files changed, 0 insertions, 0 deletions