Commit 7e39bea0 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents 2f370575 fbd6489e

There are no changes