← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Toru Maesaka
  • Date: 2008-12-14 08:26:38 UTC
  • mto: (670.1.24 devel)
  • mto: This revision was merged to the branch mainline in revision 676.
  • Revision ID: dev@torum.net-20081214082638-c8uje8oiwk4s2dh0
First pass of replacing MySQL's strxmov with libc alternatives

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
2323
2323
    goto end;                                   // No data file
2324
2324
 
2325
2325
  // Name of data file
2326
 
  strxmov(from, table->s->normalized_path.str, ext[1], NULL);
 
2326
  sprintf(from,"%s%s", table->s->normalized_path.str, ext[1]);
2327
2327
  if (stat(from, &stat_info))
2328
2328
    goto end;                           // Can't use USE_FRM flag
2329
2329
 
2448
2448
    char* db = table->db;
2449
2449
    bool fatal_error=0;
2450
2450
 
2451
 
    strxmov(table_name, db, ".", table->table_name, NULL);
 
2451
    sprintf(table_name,"%s.%s",db,table->table_name);
2452
2452
    session->open_options|= extra_open_options;
2453
2453
    table->lock_type= lock_type;
2454
2454
    /* open only one table from local list of command */
2980
2980
  if (open_tables(session, &src_table, &not_used, 0))
2981
2981
    return(true);
2982
2982
 
2983
 
  strxmov(src_path, src_table->table->s->path.str, reg_ext, NULL);
 
2983
  sprintf(src_path,"%s%s",src_table->table->s->path.str, reg_ext);
2984
2984
 
2985
2985
  /*
2986
2986
    Check that destination tables does not exist. Note that its name
5386
5386
    char table_name[NAME_LEN*2+2];
5387
5387
    Table *t;
5388
5388
 
5389
 
    strxmov(table_name, table->db ,".", table->table_name, NULL);
 
5389
    sprintf(table_name,"%s.%s",table->db,table->table_name);
5390
5390
 
5391
5391
    t= table->table= open_n_lock_single_table(session, table, TL_READ);
5392
5392
    session->clear_error();                     // these errors shouldn't get client