into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166


mysql-test/t/variables.test:
  Auto merged
mysql-test/r/variables.result:
  Manual merge
sql/log.cc:
  Manual merge, spaces added to 5.1 version
sql/mysqld.cc:
  Code no longer exists
sql/set_var.cc:
  Manual merge