diff options
| author | unknown <svoj@april.(none)> | 2006-10-02 15:12:11 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-10-02 15:12:11 +0500 |
| commit | 023cac5c3e7e276c9cda77999415983f61500c1a (patch) | |
| tree | fbe63b7dad0fcd0ec7eff11dcd3063b22cf98251 /mysql-test/r/warnings.result | |
| parent | a0b43f68d4e7b3784a4089bf33bc1310ab48236e (diff) | |
| parent | 17c4b4f625f911c4ad635a77c2d9f6f0d10de784 (diff) | |
| download | mariadb-git-023cac5c3e7e276c9cda77999415983f61500c1a.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/warnings.result')
0 files changed, 0 insertions, 0 deletions