diff options
author | unknown <svoj@mysql.com/april.(none)> | 2006-10-02 14:53:03 +0500 |
---|---|---|
committer | unknown <svoj@mysql.com/april.(none)> | 2006-10-02 14:53:03 +0500 |
commit | 17c4b4f625f911c4ad635a77c2d9f6f0d10de784 (patch) | |
tree | fc0a5e0080e0fb1ed6b5863ef65c61cf7dbe0098 /mysql-test/r/warnings.result | |
parent | 722c0f5e6273b2c1b0e07109bbd822a15520d466 (diff) | |
parent | 32d02489a8b294e0144034623ecd05eae6132439 (diff) | |
download | mariadb-git-17c4b4f625f911c4ad635a77c2d9f6f0d10de784.tar.gz |
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/warnings.result')
0 files changed, 0 insertions, 0 deletions