diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:19:19 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:19:19 +0300 |
| commit | dedfdb490ba528ddf3f9155a4fb6f0b3728df149 (patch) | |
| tree | d38210df12297fa40d9edbf59cbb72329a4ccad4 /mysql-test/r/func_concat.result | |
| parent | 7917f0852f57ff0fecb80f561eccd674a4e1866d (diff) | |
| parent | dccf2acceab7a3ed125c0d9c11330fe5f6898a1f (diff) | |
| download | mariadb-git-dedfdb490ba528ddf3f9155a4fb6f0b3728df149.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_plugin.cc
Diffstat (limited to 'mysql-test/r/func_concat.result')
0 files changed, 0 insertions, 0 deletions