← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_db.cc

  • Committer: Brian Aker
  • Date: 2008-08-05 04:10:42 UTC
  • mfrom: (261.2.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: brian@tangent.org-20080805041042-1l4893r3bwy2lxz2
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_db.cc
378
378
  bool error=1;
379
379
  uint nbytes;
380
380
 
381
 
  memset((char*) create, 0, sizeof(*create));
 
381
  memset(create, 0, sizeof(*create));
382
382
  create->default_table_charset= thd->variables.collation_server;
383
383
 
384
384
  /* Check if options for this database are already in the hash */
600
600
      error= -1;
601
601
      goto exit;
602
602
    }
603
 
    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
603
    push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
604
604
                        ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
605
605
    if (!silent)
606
606
      my_ok(thd);
852
852
      goto exit;
853
853
    }
854
854
    else
855
 
      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
855
      push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
856
856
                          ER_DB_DROP_EXISTS, ER(ER_DB_DROP_EXISTS), db);
857
857
  }
858
858
  else
1373
1373
    {
1374
1374
      /* Throw a warning and free new_db_file_name. */
1375
1375
 
1376
 
      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
1376
      push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
1377
1377
                          ER_BAD_DB_ERROR, ER(ER_BAD_DB_ERROR),
1378
1378
                          new_db_file_name.str);
1379
1379