diff options
author | unknown <ingo@mysql.com> | 2006-06-10 12:24:44 +0200 |
---|---|---|
committer | unknown <ingo@mysql.com> | 2006-06-10 12:24:44 +0200 |
commit | 2dd1dc62462a9b7348d1c815acacddedb5a62d88 (patch) | |
tree | ecb80e61dc5f282b391823c7a37a6ee02753cada /mysql-test/r/type_float.result | |
parent | a74154f4de0b4f3765eb06932fb9ec3e79f764e0 (diff) | |
parent | 8efe592d58f657800c7c4e00f2c85815f7ae03d8 (diff) | |
download | mariadb-git-2dd1dc62462a9b7348d1c815acacddedb5a62d88.tar.gz |
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-amerge
mysql-test/r/lock_multi.result:
Merging 5.0-engines to 5.0 master.
mysql-test/t/lock_multi.test:
Merging 5.0-engines to 5.0 master.
Diffstat (limited to 'mysql-test/r/type_float.result')
0 files changed, 0 insertions, 0 deletions