into  mysql.com:/home/svoj/devel/mysql/BUG25951/mysql-5.1-engines


mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
sql/item_func.cc:
  Auto merged