diff options
author | unknown <paul@kite-hub.kitebird.com> | 2004-06-16 11:23:33 -0500 |
---|---|---|
committer | unknown <paul@kite-hub.kitebird.com> | 2004-06-16 11:23:33 -0500 |
commit | c4cd310f7f9088572c68f6de139a4c63baf1c3bf (patch) | |
tree | 823cd68dac2a4095bbef726d1922aa7d670f663a /mysql-test/r/derived.result | |
parent | 02f2f2dc44d9d46b486f0b4d6130cfc4217a179e (diff) | |
parent | c2b2402f980711030dea6d2ad9d087755a58836f (diff) | |
download | mariadb-git-c4cd310f7f9088572c68f6de139a4c63baf1c3bf.tar.gz |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
Diffstat (limited to 'mysql-test/r/derived.result')
0 files changed, 0 insertions, 0 deletions