diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 12:37:00 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 12:37:00 +0300 |
commit | 85929aacc8515eceaf3afe0c94fad94748b23c96 (patch) | |
tree | 81801a917e898f4a1b12b3df79592a0f1a9eaf3c /mysql-test/r/locale.result | |
parent | 1a0728831084fabe1ccaa50e92aebfca761f8adf (diff) | |
parent | 40444a7d268cf8dafbeec1c2a87a3db85aa7cebc (diff) | |
download | mariadb-git-85929aacc8515eceaf3afe0c94fad94748b23c96.tar.gz |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'mysql-test/r/locale.result')
0 files changed, 0 insertions, 0 deletions