diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-20 17:52:59 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-20 17:52:59 +0100 |
| commit | bbb9ba764754f91b144b01db16a8f9b3f5d3dd67 (patch) | |
| tree | fd44973bd24a929894986e9176fe73539eeed82b /BUILD/compile-pentium-icc-valgrind-max | |
| parent | fd0a4f225f0f1419f6d082d307ca9ebdb23c77ec (diff) | |
| parent | c4b4bd6982beb27a1ec45699ebce09de0bf4cdfc (diff) | |
| download | mariadb-git-bbb9ba764754f91b144b01db16a8f9b3f5d3dd67.tar.gz | |
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
BUILD/check-cpu:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/query_cache_notembedded.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl000017.test:
change from 5.0 does not apply here anymore
mysql-test/t/rpl_000015.test:
after-merge fix
Diffstat (limited to 'BUILD/compile-pentium-icc-valgrind-max')
0 files changed, 0 insertions, 0 deletions