summaryrefslogtreecommitdiff
path: root/mysys/charset-def.c
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-04-01 12:35:49 +0200
committerunknown <msvensson@neptunus.(none)>2005-04-01 12:35:49 +0200
commit0344bf166534fd56095220f06960172937746327 (patch)
tree0826b8f6fd45e72e8beefa571ca0b501427faf78 /mysys/charset-def.c
parent8ef1afbaa4ba0c639f2ecf47853086e783cc1efa (diff)
parentba51ba8642a80d50231cea9e7e714248dbc2aa58 (diff)
downloadmariadb-git-0344bf166534fd56095220f06960172937746327.tar.gz
Manual merge
BitKeeper/etc/logging_ok: auto-union sql/ha_berkeley.cc: Manual merge, fix already applied to 4.1
Diffstat (limited to 'mysys/charset-def.c')
0 files changed, 0 insertions, 0 deletions