diff options
| author | unknown <igor@olga.mysql.com> | 2007-06-30 16:24:09 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-06-30 16:24:09 -0700 |
| commit | 8dcd5fca6977a8aafb0dd874b348e0078eafda94 (patch) | |
| tree | 5c5791f99f377362ada084e6a977b0dd39f605c0 /mysql-test/r/raid.result | |
| parent | a89259fad8ca301d882a26f41104abd4619a127c (diff) | |
| parent | 7fbf6303d264a84bd225e0113a910459a067e3d0 (diff) | |
| download | mariadb-git-8dcd5fca6977a8aafb0dd874b348e0078eafda94.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
into olga.mysql.com:/home/igor/mysql-5.0-opt
mysql-test/r/type_enum.result:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
sql/field_conv.cc:
SCCS merged
Diffstat (limited to 'mysql-test/r/raid.result')
0 files changed, 0 insertions, 0 deletions