diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-15 22:59:07 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-15 22:59:07 +0300 |
| commit | 391b5246fef4110bc73227c67f77eec5611a612e (patch) | |
| tree | 43a14c6ad76010ee31038173e53da44517c84dbe /sql/sp.cc | |
| parent | 92b1c2f3caafe6529a08992d7f134476c7b9ff70 (diff) | |
| parent | 27fca0ab1775a8c1dfe699c978b6448a7aa8f47b (diff) | |
| download | mariadb-git-391b5246fef4110bc73227c67f77eec5611a612e.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index a8bd419cdcc..279f0d44890 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -687,6 +687,11 @@ sp_returns_type(THD *thd, String &result, sp_head *sp) { result.append(STRING_WITH_LEN(" CHARSET ")); result.append(field->charset()->csname); + if (!(field->charset()->state & MY_CS_PRIMARY)) + { + result.append(STRING_WITH_LEN(" COLLATE ")); + result.append(field->charset()->name); + } } delete field; |