← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_class.cc

Merged in latest.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_class.cc
27
27
#include <sys/stat.h>
28
28
#include <mysys/thr_alarm.h>
29
29
#include <mysys/mysys_err.h>
30
 
#include <drizzled/drizzled_error_messages.h>
 
30
#include <drizzled/error.h>
31
31
#include <drizzled/innodb_plugin_extras.h>
32
32
 
33
33
/*
1483
1483
 
1484
1484
  if (!dirname_length(exchange->file_name))
1485
1485
  {
1486
 
    strxnmov(path, FN_REFLEN-1, mysql_real_data_home, session->db ? session->db : "",
1487
 
             NULL);
 
1486
    strcpy(path, mysql_real_data_home);
 
1487
    if (session->db)
 
1488
      strncat(path, session->db, FN_REFLEN-strlen(mysql_real_data_home)-1);
1488
1489
    (void) fn_format(path, exchange->file_name, path, "", option);
1489
1490
  }
1490
1491
  else