diff options
| author | unknown <anozdrin@mysql.com> | 2006-06-21 02:16:38 +0400 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-06-21 02:16:38 +0400 |
| commit | a28e7eb4206d74d43eb476360eaa67a6b64b0164 (patch) | |
| tree | b44d9d08eb1e8d86c469cd2dedb0689b3b22ad55 /mysql-test/t/wait_timeout-master.opt | |
| parent | d1e45ad8f86466243f961f5ce6122cd5e21af7f1 (diff) | |
| download | mariadb-git-a28e7eb4206d74d43eb476360eaa67a6b64b0164.tar.gz | |
Fix merge 5.0 -> 5.1.
mysql-test/r/im_life_cycle.result:
Fix manual merge.
Diffstat (limited to 'mysql-test/t/wait_timeout-master.opt')
0 files changed, 0 insertions, 0 deletions