← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

Merged up with brian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
228
228
  query_id= 0;
229
229
  query= NULL;
230
230
  query_length= 0;
231
 
  warn_id= 0;
 
231
  warn_query_id= 0;
232
232
  memset(ha_data, 0, sizeof(ha_data));
233
233
  replication_data= 0;
234
234
  mysys_var= 0;
914
914
  @return  NULL on failure, or pointer to the LEX_STRING object
915
915
*/
916
916
LEX_STRING *Session::make_lex_string(LEX_STRING *lex_str,
917
 
                                 const char* str, uint32_t length,
918
 
                                 bool allocate_lex_string)
 
917
                                     const std::string &str,
 
918
                                     bool allocate_lex_string)
 
919
{
 
920
  return make_lex_string(lex_str, str.c_str(), str.length(), allocate_lex_string);
 
921
}
 
922
 
 
923
LEX_STRING *Session::make_lex_string(LEX_STRING *lex_str,
 
924
                                     const char* str, uint32_t length,
 
925
                                     bool allocate_lex_string)
919
926
{
920
927
  if (allocate_lex_string)
921
928
    if (!(lex_str= (LEX_STRING *)alloc(sizeof(LEX_STRING))))