← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

Merged from Mats.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
6365
6365
                                   (file->name[1] == '.' &&  !file->name[2])))
6366
6366
        continue;
6367
6367
 
6368
 
      if (!bcmp((uchar*) file->name, (uchar*) tmp_file_prefix,
6369
 
                tmp_file_prefix_length))
 
6368
      if (!memcmp((uchar*) file->name, (uchar*) tmp_file_prefix,
 
6369
                  tmp_file_prefix_length))
6370
6370
      {
6371
6371
        char *ext= fn_ext(file->name);
6372
6372
        uint ext_len= strlen(ext);
6373
6373
        uint filePath_len= snprintf(filePath, sizeof(filePath),
6374
6374
                                    "%s%c%s", tmpdir, FN_LIBCHAR,
6375
6375
                                    file->name);
6376
 
        if (!bcmp((uchar*) reg_ext, (uchar*) ext, ext_len))
 
6376
        if (!memcmp((uchar*) reg_ext, (uchar*) ext, ext_len))
6377
6377
        {
6378
6378
          handler *handler_file= 0;
6379
6379
          /* We should cut file extention before deleting of table */