mysql-test/r/variables.result:
  update results after merge
strings/int2str.c:
  Portability fix (using 'char' as a parameter may give a warning)