← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
33
33
#include <drizzled/item/empty_string.h>
34
34
#include <drizzled/transaction_services.h>
35
35
 
 
36
#include <algorithm>
36
37
 
37
38
using namespace std;
38
39
extern drizzled::TransactionServices transaction_services;
1475
1476
          if ((length=column->length) > max_key_length ||
1476
1477
              length > file->max_key_part_length())
1477
1478
          {
1478
 
            length=cmin(max_key_length, file->max_key_part_length());
 
1479
            length= min(max_key_length, file->max_key_part_length());
1479
1480
            if (key->type == Key::MULTIPLE)
1480
1481
            {
1481
1482
              /* not a critical problem */