Fix after manual merge


mysql-test/r/range.result:
  Fix after manual merge
sql/handler.cc:
  Fix after manual merge
sql/mysql_priv.h:
  Fix after manual merge
sql/opt_range.cc:
  Fix after manual merge
sql/set_var.cc:
  Fix after manual merge
sql/sql_base.cc:
  Fix after manual merge
sql/sql_parse.cc:
  Fix after manual merge