← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/database.cc

  • Committer: Brian Aker
  • Date: 2009-11-18 06:11:12 UTC
  • mfrom: (1220.1.10 staging)
  • Revision ID: brian@gaz-20091118061112-tyf4qrfr5v7i946b
Monty + Brian Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/database.cc
26
26
{
27
27
  assert(fixed == 1);
28
28
  Session *session= current_session;
29
 
  if (session->db == NULL)
 
29
  if (session->db.empty())
30
30
  {
31
31
    null_value= 1;
32
32
    return 0;
33
33
  }
34
34
  else
35
 
    str->copy(session->db, session->db_length, system_charset_info);
 
35
    str->copy(session->db.c_str(), session->db.length(), system_charset_info);
36
36
  return str;
37
37
}
38
38