diff options
author | unknown <msvensson@shellback.(none)> | 2006-10-12 16:17:31 +0200 |
---|---|---|
committer | unknown <msvensson@shellback.(none)> | 2006-10-12 16:17:31 +0200 |
commit | a4f01a94b4d6fdf3d1c79446c7f1a36f50903d1d (patch) | |
tree | 1f19b13d412ec2a815671fe3b110f0b022003b43 /sql/item_strfunc.cc | |
parent | dd519d114ab402b944f9f50feeff5f268b780097 (diff) | |
parent | e203f0e578a064bee54d600b2c70424b9f9c9365 (diff) | |
download | mariadb-git-a4f01a94b4d6fdf3d1c79446c7f1a36f50903d1d.tar.gz |
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
0 files changed, 0 insertions, 0 deletions