~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/reverse_function/reverse_function.cc

  • Committer: Olaf van der Spek
  • Date: 2011-07-04 19:11:47 UTC
  • mto: This revision was merged to the branch mainline in revision 2367.
  • Revision ID: olafvdspek@gmail.com-20110704191147-s99ojek811zi1fzj
RemoveĀ unusedĀ Name_resolution_context::error_reporter

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
 
21
#include <config.h>
22
22
 
23
23
#include <drizzled/plugin/function.h>
24
24
#include <drizzled/function/str/strfunc.h>
25
 
#include <drizzled/charset_info.h>
 
25
#include <drizzled/charset.h>
26
26
 
27
27
using namespace drizzled;
28
28
 
52
52
  /* An empty string is a special case as the string pointer may be null */
53
53
  if (!res->length())
54
54
    return &my_empty_string;
55
 
  if (tmp_value.alloced_length() < res->length() &&
56
 
      tmp_value.realloc(res->length()))
57
 
  {
58
 
    null_value= 1;
59
 
    return 0;
60
 
  }
 
55
  if (tmp_value.alloced_length() < res->length())
 
56
      tmp_value.realloc(res->length());
61
57
  tmp_value.length(res->length());
62
58
  tmp_value.set_charset(res->charset());
63
59
  ptr= (char *) res->ptr();