← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/collation.cc

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/collation.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
 
20
#include <config.h>
21
21
 
22
22
#include <drizzled/function/str/collation.h>
23
23
 
24
 
namespace drizzled
25
 
{
 
24
namespace drizzled {
26
25
 
27
26
String *Item_func_collation::val_str(String *str)
28
27
{
29
28
  assert(fixed == 1);
30
 
  size_t dummy_errors;
31
 
  const CHARSET_INFO * const cs= args[0]->collation.collation;
 
29
  const charset_info_st* cs= args[0]->collation.collation;
32
30
 
33
31
  null_value= 0;
34
 
  str->copy(cs->name, strlen(cs->name),
35
 
            &my_charset_utf8_general_ci, collation.collation, &dummy_errors);
 
32
  str->copy(cs->name, strlen(cs->name), collation.collation);
36
33
  return str;
37
34
}
38
35