into  weblab.(none):/home/marcsql/TREE/mysql-5.1-26093-merge


mysql-test/r/func_misc.result:
  Auto merged