into  polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731


mysql-test/r/variables.result:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/t/variables.test:
  Manual merge.