← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/execute.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:
drizzled/statement/execute.cc
32
32
namespace drizzled
33
33
{
34
34
 
35
 
void parse(drizzled::Session *session, const char *inBuf, uint32_t length);
 
35
void mysql_parse(drizzled::Session *session, const char *inBuf, uint32_t length);
36
36
 
37
37
namespace statement
38
38
{
219
219
    }
220
220
    else
221
221
    {
222
 
      parse(getSession(), to_execute.str, to_execute.length);
 
222
      mysql_parse(getSession(), to_execute.str, to_execute.length);
223
223
    }
224
224
  }
225
225