summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorsergefp@pslp.mylan <>2008-04-22 03:36:24 +0400
committersergefp@pslp.mylan <>2008-04-22 03:36:24 +0400
commit45c8043596d1c9b416cc5c65e2f5cac10f5e27f1 (patch)
tree29a07c104c0bbafd7d6bc65a7fc0bc8bcfcfdac0 /strings
parent013fd236755ec402a988eaa70392e0a08c169ac0 (diff)
parentdc01e1d612d8526fe94939a37818993e4cd15f29 (diff)
downloadmariadb-git-45c8043596d1c9b416cc5c65e2f5cac10f5e27f1.tar.gz
Merge mysql.com:/home/psergey/mysql-5.0-bugteam
into mysql.com:/home/psergey/mysql-5.1-bugteam BUG#36139: manual merge
Diffstat (limited to 'strings')
0 files changed, 0 insertions, 0 deletions