← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/collation.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/collation.cc
18
18
 */
19
19
 
20
20
#include "config.h"
21
 
 
 
21
#include CSTDINT_H
22
22
#include <drizzled/function/str/collation.h>
23
23
 
24
 
namespace drizzled
25
 
{
26
 
 
27
24
String *Item_func_collation::val_str(String *str)
28
25
{
29
26
  assert(fixed == 1);
36
33
  return str;
37
34
}
38
35
 
39
 
} /* namespace drizzled */
 
36