diff options
author | unknown <paul@teton.kitebird.com> | 2004-03-08 14:08:10 -0600 |
---|---|---|
committer | unknown <paul@teton.kitebird.com> | 2004-03-08 14:08:10 -0600 |
commit | 1f3aa2593332ac480a5e3bfe8cca434ece9a2955 (patch) | |
tree | 6e8d7940567f1540c9bce9a1728f827843bc375c /mysys/mulalloc.c | |
parent | 0c50517a5e3dbc1828abb636d073a452953fe83e (diff) | |
parent | fea8903b0cb85bb43502aae43fe8bd2543fccd5c (diff) | |
download | mariadb-git-1f3aa2593332ac480a5e3bfe8cca434ece9a2955.tar.gz |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
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/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/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 'mysys/mulalloc.c')
0 files changed, 0 insertions, 0 deletions