← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/oldlibdrizzle/oldlibdrizzle.cc

  • Committer: Monty Taylor
  • Date: 2009-06-08 13:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 1060.
  • Revision ID: mordred@inaugust.com-20090608134255-frpa7by5d69g811m
Removed more charset conversion code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/oldlibdrizzle/oldlibdrizzle.cc
768
768
  char *passwd= strchr(user, '\0')+1;
769
769
  uint32_t user_len= passwd - user - 1;
770
770
  char *l_db= passwd;
771
 
  char db_buff[NAME_LEN + 1];           // buffer to store db in utf8
772
 
  char user_buff[USERNAME_LENGTH + 1];    // buffer to store user in utf8
773
 
  uint32_t dummy_errors;
774
771
 
775
772
  /*
776
773
    Old clients send null-terminated string as password; new clients send
795
792
    return false;
796
793
  }
797
794
 
798
 
  /* Since 4.1 all database names are stored in utf8 */
799
 
  if (l_db)
800
 
  {
801
 
    db_buff[copy_and_convert(db_buff, sizeof(db_buff)-1,
802
 
                             system_charset_info,
803
 
                             l_db, db_len,
804
 
                             session->charset(), &dummy_errors)]= 0;
805
 
    l_db= db_buff;
806
 
  }
807
 
 
808
 
  user_buff[user_len= copy_and_convert(user_buff, sizeof(user_buff)-1,
809
 
                                       system_charset_info, user, user_len,
810
 
                                       session->charset(), &dummy_errors)]= '\0';
811
 
  user= user_buff;
812
 
 
813
795
  /* If username starts and ends in "'", chop them off */
814
796
  if (user_len > 1 && user[0] == '\'' && user[user_len - 1] == '\'')
815
797
  {