← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
15
15
 
16
16
 
17
17
/* create and drop of databases */
18
 
#include <drizzled/global.h>
19
 
#include CSTDINT_H
20
 
#include CINTTYPES_H
 
18
#include "config.h"
21
19
#include <string>
22
20
#include <fstream>
 
21
#include <fcntl.h>
23
22
#include <drizzled/message/schema.pb.h>
24
 
using namespace std;
25
 
#include <drizzled/server_includes.h>
26
23
#include <mysys/mysys_err.h>
27
24
#include <mysys/my_dir.h>
28
25
#include <drizzled/error.h>
29
26
#include <drizzled/gettext.h>
30
27
#include <mysys/hash.h>
 
28
#include "mystrings/m_string.h"
31
29
#include <drizzled/session.h>
32
30
#include <drizzled/db.h>
33
31
#include <drizzled/sql_base.h>
35
33
#include <drizzled/errmsg_print.h>
36
34
#include <drizzled/replication_services.h>
37
35
#include <drizzled/message/schema.pb.h>
38
 
 
 
36
#include "drizzled/sql_table.h"
 
37
#include "drizzled/plugin/info_schema_table.h"
 
38
#include "drizzled/global_charset_info.h"
 
39
#include "drizzled/pthread_globals.h"
 
40
 
 
41
 
 
42
using namespace std;
39
43
using namespace drizzled;
40
44
 
41
45
#define MY_DB_OPT_FILE "db.opt"
666
670
      table_list->table_name= strcpy(table_list->db, db) + db_len + 1;
667
671
      filename_to_tablename(file->name, table_list->table_name,
668
672
                            strlen(file->name) + 1);
669
 
      table_list->alias= table_list->table_name;        // If lower_case_table_names=2
670
 
      table_list->internal_tmp_table= is_prefix(file->name, TMP_FILE_PREFIX);
 
673
      table_list->alias= table_list->table_name;  // If lower_case_table_names=2
 
674
      table_list->internal_tmp_table= (strncmp(file->name,
 
675
                                               TMP_FILE_PREFIX,
 
676
                                               strlen(TMP_FILE_PREFIX)) == 0);
671
677
      /* Link into list */
672
678
      (*tot_list_next)= table_list;
673
679
      tot_list_next= &table_list->next_local;