← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Monty Taylor
  • Date: 2008-11-07 04:42:46 UTC
  • mfrom: (575.4.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: monty@inaugust.com-20081107044246-n8hnlrzsjn0uvca0
Merged from ysano. Reverted changes to storage/innobase/handler, which is not built by drizzle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
4222
4222
bool test_if_data_home_dir(const char *dir)
4223
4223
{
4224
4224
  char path[FN_REFLEN], conv_path[FN_REFLEN];
4225
 
  uint32_t dir_len, home_dir_len= strlen(mysql_unpacked_real_data_home);
 
4225
  uint32_t dir_len, home_dir_len= strlen(drizzle_unpacked_real_data_home);
4226
4226
 
4227
4227
  if (!dir)
4228
4228
    return(0);
4235
4235
  {
4236
4236
    if (!my_strnncoll(character_set_filesystem,
4237
4237
                      (const unsigned char*) conv_path, home_dir_len,
4238
 
                      (const unsigned char*) mysql_unpacked_real_data_home,
 
4238
                      (const unsigned char*) drizzle_unpacked_real_data_home,
4239
4239
                      home_dir_len))
4240
4240
      return(1);
4241
4241
  }