← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2008-12-15 07:27:18 UTC
  • mfrom: (670.1.24 devel)
  • Revision ID: brian@tangent.org-20081215072718-uf9nak79262b8snk
Merge of Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
30
30
#include <drizzled/replicator.h>
31
31
#include <drizzled/lock.h>
32
32
#include <drizzled/unireg.h>
 
33
#include <drizzled/item/int.h>
33
34
#include <drizzled/item/empty_string.h>
34
35
 
35
36
using namespace std;
2324
2325
    goto end;                                   // No data file
2325
2326
 
2326
2327
  // Name of data file
2327
 
  strxmov(from, table->s->normalized_path.str, ext[1], NULL);
 
2328
  sprintf(from,"%s%s", table->s->normalized_path.str, ext[1]);
2328
2329
  if (stat(from, &stat_info))
2329
2330
    goto end;                           // Can't use USE_FRM flag
2330
2331
 
2449
2450
    char* db = table->db;
2450
2451
    bool fatal_error=0;
2451
2452
 
2452
 
    strxmov(table_name, db, ".", table->table_name, NULL);
 
2453
    sprintf(table_name,"%s.%s",db,table->table_name);
2453
2454
    session->open_options|= extra_open_options;
2454
2455
    table->lock_type= lock_type;
2455
2456
    /* open only one table from local list of command */
2981
2982
  if (open_tables(session, &src_table, &not_used, 0))
2982
2983
    return(true);
2983
2984
 
2984
 
  strxmov(src_path, src_table->table->s->path.str, reg_ext, NULL);
 
2985
  sprintf(src_path,"%s%s",src_table->table->s->path.str, reg_ext);
2985
2986
 
2986
2987
  /*
2987
2988
    Check that destination tables does not exist. Note that its name
5387
5388
    char table_name[NAME_LEN*2+2];
5388
5389
    Table *t;
5389
5390
 
5390
 
    strxmov(table_name, table->db ,".", table->table_name, NULL);
 
5391
    sprintf(table_name,"%s.%s",table->db,table->table_name);
5391
5392
 
5392
5393
    t= table->table= open_n_lock_single_table(session, table, TL_READ);
5393
5394
    session->clear_error();                     // these errors shouldn't get client