← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_db.cc

  • Committer: Monty Taylor
  • Date: 2008-10-04 18:42:30 UTC
  • Revision ID: monty@inaugust.com-20081004184230-j2j1uottu2d0yl0m
Removed NullS. bu-bye.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_db.cc
30
30
 
31
31
#define MAX_DROP_TABLE_Q_LEN      1024
32
32
 
33
 
const char *del_exts[]= {".frm", ".BAK", ".TMD",".opt", NullS};
 
33
const char *del_exts[]= {".frm", ".BAK", ".TMD",".opt", NULL};
34
34
static TYPELIB deletable_extentions=
35
35
{array_elements(del_exts)-1,"del_exts", del_exts, NULL};
36
36
 
280
280
    char *tmp_name;
281
281
    if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
282
282
                         &opt, (uint) sizeof(*opt), &tmp_name, (uint) length+1,
283
 
                         NullS))
 
283
                         NULL))
284
284
    {
285
285
      error= true;
286
286
      goto end;
623
623
    {
624
624
      query=         tmp_query;
625
625
      query_length= (uint) (strxmov(tmp_query,"create database `",
626
 
                                    db, "`", NullS) - tmp_query);
 
626
                                    db, "`", NULL) - tmp_query);
627
627
    }
628
628
    else
629
629
    {
842
842
      /* The client used the old obsolete mysql_drop_db() call */
843
843
      query= path;
844
844
      query_length= (uint) (strxmov(path, "drop database `", db, "`",
845
 
                                     NullS) - path);
 
845
                                     NULL) - path);
846
846
    }
847
847
    else
848
848
    {
987
987
    }
988
988
    else
989
989
    {
990
 
      strxmov(filePath, org_path, "/", file->name, NullS);
 
990
      strxmov(filePath, org_path, "/", file->name, NULL);
991
991
      if (my_delete_with_symlink(filePath,MYF(MY_WME)))
992
992
      {
993
993
        goto err;