diff options
| author | unknown <jimw@mysql.com> | 2005-11-29 15:33:58 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-29 15:33:58 -0800 |
| commit | d9d1337e2e1772c8a08051caa71234681d9845b5 (patch) | |
| tree | d4e212a2385d1df6283bfca8b3cace1b20ed1de1 /mysql-test/t/sp-prelocking.test | |
| parent | e77da4fc83cc2cbacad9be4c9efc4704224cf660 (diff) | |
| parent | a171aa693e7f1c28ce67761621d032704fabde70 (diff) | |
| download | mariadb-git-d9d1337e2e1772c8a08051caa71234681d9845b5.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/union.result:
Auto merged
sql/item.cc:
Auto merged
vio/viosslfactories.c:
Auto merged
mysql-test/t/union.test:
Resolve conflict
Diffstat (limited to 'mysql-test/t/sp-prelocking.test')
0 files changed, 0 insertions, 0 deletions