diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-09 16:51:32 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-09 16:51:32 +0400 |
| commit | 209802eb79f69afd20b8e21db3b86ff6d9d933ea (patch) | |
| tree | 21132a2634a78e6b5d8c1aa06b42bae2e2ec4aa0 /mysql-test/t/ndb_lock.test | |
| parent | d5f3bc14c0f06e4774c61d95ebee0bd4e70cf869 (diff) | |
| parent | e68df7a1ab28e92647705adae6eb1d8d7e1bf6ce (diff) | |
| download | mariadb-git-209802eb79f69afd20b8e21db3b86ff6d9d933ea.tar.gz | |
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/ndb_lock.test')
0 files changed, 0 insertions, 0 deletions