← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Nathan Williams
  • Date: 2009-06-23 21:20:32 UTC
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090623212032-3hzm3n6jnh3r2b0u
First few changes at converting cmin to std::min.
Small style edits around conversions as well.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
37
37
#include <drizzled/show.h>
38
38
#include <drizzled/scheduling.h>
39
39
 
 
40
#include <algorithm>
 
41
 
 
42
using namespace std;
 
43
 
 
44
 
40
45
/*
41
46
  The following is used to initialise Table_ident with a internal
42
47
  table name
1224
1229
    else
1225
1230
    {
1226
1231
      if (fixed_row_size)
1227
 
        used_length=cmin(res->length(),item->max_length);
 
1232
        used_length= min(res->length(),item->max_length);
1228
1233
      else
1229
 
        used_length=res->length();
 
1234
        used_length= res->length();
 
1235
 
1230
1236
      if ((result_type == STRING_RESULT || is_unsafe_field_sep) &&
1231
1237
           escape_char != -1)
1232
1238
      {