← Back to branch summary

~codership/codership-mysql/release-0.7

« back to all changes in this revision

Viewing changes to sql/mysqld.cc

  • Committer: Teemu Ollakka
  • Date: 2010-10-13 07:32:36 UTC
  • mfrom: (2661.578.21 mysql-5.1.47-release)
  • Revision ID: teemu.ollakka@codership.com-20101013073236-p1l27hfwk8hndjlw
References lp:624960
  
merge -r 3366..tag:mysql-5.1.47 lp:mysql-server/5.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/mysqld.cc
9420
9420
  if (!opt_secure_file_priv)
9421
9421
    return TRUE;
9422
9422
 
 
9423
  if (strlen(path) >= FN_REFLEN)
 
9424
    return FALSE;
 
9425
 
9423
9426
  if (my_realpath(buff1, path, 0))
9424
9427
  {
9425
9428
    /*
9506
9509
    }
9507
9510
    else
9508
9511
    {
 
9512
      if (strlen(opt_secure_file_priv) >= FN_REFLEN)
 
9513
        opt_secure_file_priv[FN_REFLEN-1]= '\0';
9509
9514
      if (my_realpath(buff, opt_secure_file_priv, 0))
9510
9515
      {
9511
9516
        sql_print_warning("Failed to normalize the argument for --secure-file-priv.");