diff options
| author | unknown <istruewing@stella.local> | 2008-01-15 12:51:51 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-01-15 12:51:51 +0100 |
| commit | 543cee3ea4119f9b00f38dd20adf2bad66e0f445 (patch) | |
| tree | 68123483c78de9214bf60e7b6a71571d0be97b8c /mysql-test/r/cast.result | |
| parent | 99e49a34d4eab1d110645edeafbb04044a15812b (diff) | |
| parent | 18a7ec307977df75160e071b57355404a09e8e96 (diff) | |
| download | mariadb-git-543cee3ea4119f9b00f38dd20adf2bad66e0f445.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into stella.local:/home2/mydev/mysql-5.1-axmrg
mysql-test/t/myisam.test:
Auto merged
storage/myisam/mi_open.c:
Auto merged
mysql-test/r/myisam.result:
Manual merge from 5.0
Diffstat (limited to 'mysql-test/r/cast.result')
0 files changed, 0 insertions, 0 deletions