diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-12-11 12:34:48 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-12-11 12:34:48 +0100 |
| commit | b16279ac6effe80f66432f4aa7fc60b5c18b89f6 (patch) | |
| tree | 164dd7ea655e36da775aa44c1d35c5119588e6a1 /mysql-test/r/archive.result | |
| parent | 7dc7c8d927b798815c9db0e45435705a7430e51b (diff) | |
| parent | a63a66cb46d16088fd9c634c2b0ebca0471e78ad (diff) | |
| download | mariadb-git-b16279ac6effe80f66432f4aa7fc60b5c18b89f6.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'mysql-test/r/archive.result')
0 files changed, 0 insertions, 0 deletions