← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_plugin.cc

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_plugin.cc
34
34
#include <string>
35
35
#include <vector>
36
36
#include <map>
 
37
#include <algorithm>
37
38
 
38
39
#include <drizzled/error.h>
39
40
#include <drizzled/gettext.h>
1038
1039
                     &error, &error_len, &not_used);
1039
1040
    if (error_len)
1040
1041
    {
1041
 
      length= cmin(sizeof(buff), (unsigned long)error_len);
 
1042
      length= min((uint32_t)sizeof(buff), error_len);
1042
1043
      strncpy(buff, error, length);
1043
1044
      buff[length]= '\0';
1044
1045
      strvalue= buff;