diff options
author | unknown <gshchepa/uchum@host.loc> | 2008-02-13 19:37:05 +0400 |
---|---|---|
committer | unknown <gshchepa/uchum@host.loc> | 2008-02-13 19:37:05 +0400 |
commit | 22e2762640a401a71604c2fdb1a3a3454b79de80 (patch) | |
tree | d93b2a137a6235824590b1871d219fee4827c6f6 /strings/bchange.c | |
parent | 7a43d720245d1d9999ebf7d064063ed873eea60d (diff) | |
parent | 7a290b55f7691b2518cb1d83da252e07376954f6 (diff) | |
download | mariadb-git-22e2762640a401a71604c2fdb1a3a3454b79de80.tar.gz |
Merge host.loc:/home/uchum/work/5.0-opt-gca
into host.loc:/home/uchum/work/5.1-opt-gca
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'strings/bchange.c')
0 files changed, 0 insertions, 0 deletions