← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.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_parse.cc
828
828
    break;
829
829
  case COM_PROCESS_INFO:
830
830
    status_var_increment(thd->status_var.com_stat[SQLCOM_SHOW_PROCESSLIST]);
831
 
    mysqld_list_processes(thd, NullS, 0);
 
831
    mysqld_list_processes(thd, NULL, 0);
832
832
    break;
833
833
  case COM_PROCESS_KILL:
834
834
  {
2003
2003
  }
2004
2004
  break;
2005
2005
  case SQLCOM_SHOW_PROCESSLIST:
2006
 
    mysqld_list_processes(thd, NullS, lex->verbose);
 
2006
    mysqld_list_processes(thd, NULL, lex->verbose);
2007
2007
    break;
2008
2008
  case SQLCOM_SHOW_ENGINE_LOGS:
2009
2009
    {
2784
2784
  */
2785
2785
  if ((var= get_system_var(thd, OPT_SESSION, tmp, null_lex_string)))
2786
2786
  {
2787
 
    end= strxmov(buff, "@@session.", var_name, NullS);
 
2787
    end= strxmov(buff, "@@session.", var_name, NULL);
2788
2788
    var->set_name(buff, end-buff, system_charset_info);
2789
2789
    add_item_to_list(thd, var);
2790
2790
  }
3829
3829
  }
3830
3830
  /* Fix is using unix filename format on dos */
3831
3831
  my_stpcpy(buff,*filename_ptr);
3832
 
  end=convert_dirname(buff, *filename_ptr, NullS);
 
3832
  end=convert_dirname(buff, *filename_ptr, NULL);
3833
3833
  if (!(ptr= (char*) thd->alloc((size_t) (end-buff) + strlen(table_name)+1)))
3834
3834
    return 1;                                   // End of memory
3835
3835
  *filename_ptr=ptr;
3836
 
  strxmov(ptr,buff,table_name,NullS);
 
3836
  strxmov(ptr,buff,table_name,NULL);
3837
3837
  return 0;
3838
3838
}
3839
3839