Merge polly.(none):/home/kaa/src/opt/bug29131/my50-bug29131

into  polly.(none):/home/kaa/src/opt/bug29131/my51-bug29131


mysql-test/r/variables.result:
  Null merge.
mysql-test/t/variables.test:
  Null merge.
sql/mysql_priv.h:
  Null merge.
sql/mysqld.cc:
  Null merge.
sql/set_var.cc:
  Null merge.
sql/set_var.h:
  Null merge.