After merge fix


sql/sql_lex.cc:
  After merge fix
sql/set_var.cc:
  After merge fix
sql/sql_yacc.yy:
  After merge fix
sql/sql_lex.h:
  After merge fix
mysql-test/r/key_cache.result:
  After merge fix