← Back to branch summary

~mordred/drizzle/fix-bell-bugs

« 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
20
20
#include <fstream>
21
21
#include <fcntl.h>
22
22
#include <drizzled/message/schema.pb.h>
23
 
#include <mysys/mysys_err.h>
24
 
#include <mysys/my_dir.h>
 
23
#include "drizzled/my_error.h"
 
24
#include "drizzled/internal/my_dir.h"
25
25
#include <drizzled/error.h>
26
26
#include <drizzled/gettext.h>
27
 
#include <mysys/hash.h>
28
 
#include "mystrings/m_string.h"
 
27
#include <drizzled/my_hash.h>
 
28
#include "drizzled/internal/m_string.h"
29
29
#include <drizzled/session.h>
30
30
#include <drizzled/db.h>
31
31
#include <drizzled/sql_base.h>
37
37
#include "drizzled/plugin/info_schema_table.h"
38
38
#include "drizzled/global_charset_info.h"
39
39
#include "drizzled/pthread_globals.h"
 
40
#include "drizzled/charset.h"
40
41
 
 
42
#include "drizzled/internal/my_sys.h"
41
43
 
42
44
using namespace std;
43
45
using namespace drizzled;
231
233
      goto exit;
232
234
    }
233
235
 
234
 
    my_error(ER_CANT_CREATE_DB, MYF(0), database_name.to_string().c_str(), my_errno);
 
236
    my_error(ER_CANT_CREATE_DB, MYF(0), database_name.to_string().c_str(), errno);
235
237
    error= true;
236
238
    goto exit;
237
239
  }