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

into  mysql.com:/home/jimw/my/mysql-4.1-clean

sql/item_strfunc.cc

@@ -472,11 +472,11 @@ 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))
+  if ((null_value= args[0]->null_value))
     return 0;
-  length=res->length();
+  length= res->length();
   if (length < 9 || (length % 8) != 1 || !((*res)[0] & 128))
     return res;				// Skip decryption if not encrypted