← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/load_file.cc

Remove dead memset call.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/load_file.cc
42
42
  if (!(file_name= args[0]->val_str(str)))
43
43
    goto err;
44
44
 
45
 
  (void) internal::fn_format(path, file_name->c_ptr(), drizzle_real_data_home, "",
 
45
  (void) internal::fn_format(path, file_name->c_ptr(), data_home_real, "",
46
46
                   MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
47
47
 
48
48
  /* Read only allowed from within dir specified by secure_file_priv */
58
58
    /* my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), file_name->c_ptr()); */
59
59
    goto err;
60
60
  }
61
 
  if (stat_info.st_size > (long) current_session->variables.max_allowed_packet)
 
61
  if (stat_info.st_size > (long) session.variables.max_allowed_packet)
62
62
  {
63
 
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
63
    push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
64
64
                        ER_WARN_ALLOWED_PACKET_OVERFLOWED,
65
65
                        ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
66
 
                        func_name(), current_session->variables.max_allowed_packet);
 
66
                        func_name(), session.variables.max_allowed_packet);
67
67
    goto err;
68
68
  }
69
69
  if (tmp_value.alloc((size_t)stat_info.st_size))