← Back to branch summary

~mdcallag/+junk/5.1-map

« back to all changes in this revision

Viewing changes to sql/sql_plugin.cc

  • Committer: msvensson at pilot
  • Date: 2007-04-24 09:11:45 UTC
  • mfrom: (2469.1.106)
  • Revision ID: sp1r-msvensson@pilot.blaudden-20070424091145-10463
Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_plugin.cc
162
162
    plugin directory are used (to make this even remotely secure).
163
163
  */
164
164
  if (my_strchr(files_charset_info, dl->str, dl->str + dl->length, FN_LIBCHAR) ||
165
 
      dl->length > NAME_LEN ||
 
165
      check_string_char_length((LEX_STRING *) dl, "", NAME_CHAR_LEN,
 
166
                               system_charset_info, 1) ||
166
167
      plugin_dir_len + dl->length + 1 >= FN_REFLEN)
167
168
  {
168
169
    if (report & REPORT_TO_USER)
944
945
  table->use_all_columns();
945
946
  table->field[0]->store(name->str, name->length, system_charset_info);
946
947
  if (! table->file->index_read_idx(table->record[0], 0,
947
 
                                    (byte *)table->field[0]->ptr,
948
 
                                    table->key_info[0].key_length,
 
948
                                    (byte *)table->field[0]->ptr, HA_WHOLE_KEY,
949
949
                                    HA_READ_KEY_EXACT))
950
950
  {
951
951
    int error;