diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-20 04:04:57 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-20 04:04:57 +0500 |
| commit | 5c4c5941685c3a1eb1f606c0d3ecd6e5b91e87b6 (patch) | |
| tree | f65271a017c12188266a2bbcacba38d65cc23c43 /mysql-test/r/mysqltest.result | |
| parent | f8c9269f2bf4b069198877555c15508ed3c513ab (diff) | |
| parent | 6a34c8fcd3945c12e4aca1e419ce96fc1dec3352 (diff) | |
| download | mariadb-git-5c4c5941685c3a1eb1f606c0d3ecd6e5b91e87b6.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqltest.result')
0 files changed, 0 insertions, 0 deletions