Commit ed9ecb06 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-12757 

into  mysql.com:/home/jimw/my/mysql-4.1-clean
parents e6ac9175 6c555e7d

sql/item_strfunc.cc

+3 −3
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ String *Item_func_des_decrypt::val_str(String *str) 
  struct st_des_keyblock keyblock;

  struct st_des_keyschedule keyschedule;

  String *res= args[0]->val_str(str);

  uint length=res->length(),tail;

  uint length,tail;



  if ((null_value= args[0]->null_value))

    return 0;