← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2010-02-25 07:54:52 UTC
  • mfrom: (1273.13.101 build)
  • Revision ID: brian@gaz-20100225075452-19eozreshbrerypu
Merge of all patches in build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
671
671
 
672
672
bool Session::checkUser(const char *passwd, uint32_t passwd_len, const char *in_db)
673
673
{
674
 
  LEX_STRING db_str= { (char *) in_db, in_db ? strlen(in_db) : 0 };
675
674
  bool is_authenticated;
676
675
 
677
676
  if (passwd_len != 0 && passwd_len != SCRAMBLE_LENGTH)
695
694
  /* Change database if necessary */
696
695
  if (in_db && in_db[0])
697
696
  {
698
 
    if (mysql_change_db(this, &db_str, false))
 
697
    if (mysql_change_db(this, in_db, false))
699
698
    {
700
699
      /* mysql_change_db() has pushed the error message. */
701
700
      return false;