diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-09 13:14:29 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-09 13:14:29 +0300 |
| commit | a88cb293923824d37e48d3dfc36b09d4c0ac5072 (patch) | |
| tree | 920e9296b28a45398f389e2b9d1263342645de6f /sql/item_strfunc.cc | |
| parent | 9ef12dceec1e4f7f1a76e306adbca89d69026560 (diff) | |
| parent | 0d9f6bccd3d633425a7861cbcb851596af8ac7e1 (diff) | |
| download | mariadb-git-a88cb293923824d37e48d3dfc36b09d4c0ac5072.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/suite/ndb/r/ndb_dd_ddl.result
Diffstat (limited to 'sql/item_strfunc.cc')
0 files changed, 0 insertions, 0 deletions