← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

* Renames Ha_trx_info to drizzled::ResourceContext
* Renames Sesssion_TRANS to drizzled::TransactionContext
* Replaces homegrown linked-lists of Ha_trx_info pointers
  with vector<drizzled::ResourceContext> operations
* Renames Session::getEngineInfo() to Session::getResourceContext()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/conv.cc
21
21
#include <drizzled/function/str/conv.h>
22
22
#include "drizzled/internal/m_string.h"
23
23
 
24
 
namespace drizzled
25
 
{
26
 
 
27
24
String *Item_func_conv::val_str(String *str)
28
25
{
29
26
  assert(fixed == 1);
51
48
    dec= (int64_t) my_strntoull(res->charset(), res->ptr(), res->length(),
52
49
                                 from_base, &endptr, &err);
53
50
 
54
 
  ptr= internal::int64_t2str(dec, ans, to_base);
 
51
  ptr= int64_t2str(dec, ans, to_base);
55
52
  if (str->copy(ans, (uint32_t) (ptr-ans), default_charset()))
56
53
    return &my_empty_string;
57
54
  return str;
58
55
}
59
56
 
60
57
 
61
 
} /* namespace drizzled */