← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleimport.cc

  • Committer: Lee Bieber
  • Date: 2010-12-15 16:23:36 UTC
  • mfrom: (1995.1.2 build)
  • Revision ID: kalebral@gmail.com-20101215162336-juntyt4gw4vgohg4
Merge Andrew - fix bug 628912: Crash / segfault in drizzled::Item_func::arguments (this=0x35) at ./drizzled/function/func.h
Merge Andrew - 663919: next query after KILL QUERY will error

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleimport.cc
2
2
  Copyright (C) 2010 Vijay Samuel
3
3
  Copyright (C) 2010 Brian Aker
4
4
  Copyright (C) 2000-2006 MySQL AB
5
 
  Copyright (C) 2008-2009 Sun Microsystems, Inc.
 
5
  Copyright (C) 2008-2009 Sun Microsystems, Inc
6
6
 
7
7
  This program is free software; you can redistribute it and/or modify
8
8
  it under the terms of the GNU General Public License as published by
39
39
 
40
40
int exitcode= 0;
41
41
 
42
 
const char *program_name= "drizzleimport";
 
42
const char *program_name= "drizzlesimport";
43
43
 
44
44
/* Global Thread counter */
45
45
uint32_t counter;