diff options
| author | unknown <dlenev@mockturtle.local> | 2007-08-05 13:26:10 +0400 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2007-08-05 13:26:10 +0400 |
| commit | 5b25fc54055c5a609f92018997903643d95cf967 (patch) | |
| tree | 488726ec744165ce4ee2d7ad9ad36282ee9c4a0c /mysql-test/r/lock_multi.result | |
| parent | 966e113a2abd065ca6e33381da3de1510ec27774 (diff) | |
| parent | af2d0f87c98df8c856e4ff975f84920e97101363 (diff) | |
| download | mariadb-git-5b25fc54055c5a609f92018997903643d95cf967.tar.gz | |
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21281
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg21281-2
mysql-test/t/federated.test:
Auto merged
mysys/thr_lock.c:
Auto merged
mysql-test/r/federated.result:
SCCS merged
Diffstat (limited to 'mysql-test/r/lock_multi.result')
0 files changed, 0 insertions, 0 deletions