← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

Merge Stewart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
2370
2370
#define AVG_STRING_LENGTH_TO_PACK_ROWS   64
2371
2371
#define RATIO_TO_PACK_ROWS             2
2372
2372
 
2373
 
static void make_internal_temporary_table_path(Session *session, char* path)
 
2373
static void make_internal_temporary_table_path(Session *session, char *path)
2374
2374
{
2375
 
  /* if we run out of slots or we are not using tempool */
2376
2375
  snprintf(path, FN_REFLEN, "%s%lx_%"PRIx64"_%x", TMP_FILE_PREFIX, (unsigned long)current_pid,
2377
2376
           session->thread_id, session->tmp_table++);
2378
2377
 
2379
 
  /*
2380
 
    No need to change table name to lower case as we are only creating
2381
 
    MyISAM or HEAP tables here
2382
 
  */
2383
2378
  internal::fn_format(path, path, drizzle_tmpdir, "", MY_REPLACE_EXT|MY_UNPACK_FILENAME);
2384
2379
}
2385
2380
 
2401
2396
  bool  using_unique_constraint= false;
2402
2397
  bool  use_packed_rows= true;
2403
2398
  bool  not_all_columns= !(select_options & TMP_TABLE_ALL_COLUMNS);
2404
 
  char  *tmpname,path[FN_REFLEN];
 
2399
  char  *tmpname;
 
2400
  char  path[FN_REFLEN];
2405
2401
  unsigned char *pos, *group_buff, *bitmaps;
2406
2402
  unsigned char *null_flags;
2407
2403
  Field **reg_field, **from_field, **default_field;