-
unknown authored
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0 innobase/srv/srv0srv.c: Auto merged sql/ha_innodb.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
6f45da15
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0 innobase/srv/srv0srv.c: Auto merged sql/ha_innodb.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged