diff options
author | unknown <bar@bar.myoffice.izhnet.ru> | 2008-02-20 14:38:52 +0400 |
---|---|---|
committer | unknown <bar@bar.myoffice.izhnet.ru> | 2008-02-20 14:38:52 +0400 |
commit | 681363e29e4128eeca47bdc9d04d052cdcdd1da8 (patch) | |
tree | 1c48989c5f7bc3ece32bec14b076feebd0e92b26 /strings/strxmov.c | |
parent | 0946b1d2a7d28c6992b2c2f0a74f76708bf761ad (diff) | |
parent | f792cf3e3857040667746e662aad9a0ef4dea676 (diff) | |
download | mariadb-git-681363e29e4128eeca47bdc9d04d052cdcdd1da8.tar.gz |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b32510
into mysql.com:/home/bar/mysql-work/mysql-5.0.b32510v2
mysql-test/r/ctype_big5.result:
Auto merged
mysql-test/r/ctype_cp932.result:
Auto merged
mysql-test/r/ctype_euckr.result:
Auto merged
mysql-test/r/ctype_gb2312.result:
Auto merged
mysql-test/r/ctype_gbk.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_cp932.test:
Auto merged
mysql-test/t/ctype_uca.test:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
strings/ctype-ucs2.c:
Auto merged
Diffstat (limited to 'strings/strxmov.c')
0 files changed, 0 insertions, 0 deletions