Commit 32220745 authored by unknown's avatar unknown
Browse files

after merge fixes 

Originally contained in 2005/03/03 23:57:48+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


sql/sql_udf.cc:
  after merge fixes
parent b6a38fc7

sql/sql_udf.cc

+6 −6
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ static char *init_syms(udf_func *tmp, char *nm) 
{

  char *end;



  if (!((tmp->func= dlsym(tmp->dlhandle, tmp->name))))

    return tmp->name;

  if (!((tmp->func= dlsym(tmp->dlhandle, tmp->name.str))))

    return tmp->name.str;



  end=strmov(nm,tmp->name.str);
@@ -193,17 +193,17 @@ void udf_init() 
      This is done to ensure that only approved dll from the system

      directories are used (to make this even remotely secure).

    */

    if (strchr(dl_name, '/') || strlen(name) > NAME_LEN)

    if (strchr(dl_name, '/') || name.length > NAME_LEN)

    {

      sql_print_error("Invalid row in mysql.func table for function '%.64s'",

                      name);

                      name.str);

      continue;

    }



    if (!(tmp = add_udf(&name,(Item_result) table->field[1]->val_int(),

			dl_name, udftype)))

    {

      sql_print_error("Can't alloc memory for udf function: '%.64s'", name);

      sql_print_error("Can't alloc memory for udf function: '%.64s'", name.str);

      continue;

    }