← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Lee Bieber
  • Date: 2010-11-16 17:50:17 UTC
  • mfrom: (1932.3.2 trunk)
  • Revision ID: kalebral@gmail.com-20101116175017-sken3dkkpfcd2snv
Merge Brian - session fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
1132
1132
          session->getSecurityContext().getIp().c_str(),
1133
1133
          session->getSecurityContext().getUser().c_str()
1134
1134
  );
1135
 
  fprintf(f,
1136
 
          "\n%s", session->getQueryString().c_str()
1137
 
  );
 
1135
  fprintf(f, "\n%s", session->getQueryString()->c_str());
1138
1136
  putc('\n', f);
1139
1137
}
1140
1138
 
1254
1252
        void*   session,        /*!< in: MySQL thread handle */
1255
1253
        size_t* length)         /*!< out: length of the SQL statement */
1256
1254
{
1257
 
  *length= static_cast<Session*>(session)->query.length();
1258
 
  return static_cast<Session*>(session)->query.c_str();
 
1255
  return static_cast<Session*>(session)->getQueryStringCopy(*length);
1259
1256
}
1260
1257
 
1261
1258
#if defined (__WIN__) && defined (MYSQL_DYNAMIC_PLUGIN)