Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
This commit is contained in:
unknown 2007-10-29 10:34:35 +03:00
commit 8a5f350ffb

Diff content is not available