← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: brian
  • Date: 2008-07-27 01:04:38 UTC
  • mfrom: (224.2.3 drizzle)
  • Revision ID: brian@localhost.localdomain-20080727010438-1876txjoe7e8oce3
Merge from Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
4535
4535
 
4536
4536
  if (home_dir_len < dir_len)
4537
4537
  {
4538
 
    if (lower_case_file_system)
4539
 
    {
4540
 
      if (!my_strnncoll(character_set_filesystem,
4541
 
                        (const uchar*) conv_path, home_dir_len,
4542
 
                        (const uchar*) mysql_unpacked_real_data_home,
4543
 
                        home_dir_len))
4544
 
        return(1);
4545
 
    }
4546
 
    else if (!memcmp(conv_path, mysql_unpacked_real_data_home, home_dir_len))
 
4538
    if (!my_strnncoll(character_set_filesystem,
 
4539
                      (const uchar*) conv_path, home_dir_len,
 
4540
                      (const uchar*) mysql_unpacked_real_data_home,
 
4541
                      home_dir_len))
4547
4542
      return(1);
4548
4543
  }
4549
4544
  return(0);