← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_db.cc

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_db.cc
17
17
/* create and drop of databases */
18
18
 
19
19
#include "mysql_priv.h"
20
 
#include <mysys_err.h>
21
 
#include <my_dir.h>
22
 
#include <m_ctype.h>
 
20
#include <mysys/mysys_err.h>
 
21
#include <mysys/my_dir.h>
23
22
#include "log.h"
24
23
 
25
24
#define MAX_DROP_TABLE_Q_LEN      1024
424
423
  bool error=1;
425
424
  uint nbytes;
426
425
 
427
 
  bzero((char*) create,sizeof(*create));
 
426
  memset((char*) create, 0, sizeof(*create));
428
427
  create->default_table_charset= thd->variables.collation_server;
429
428
 
430
429
  /* Check if options for this database are already in the hash */