unknown 719bfafc2f Merge mysql.com:/home/jimw/my/mysql-5.0-1039 ...

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
include/sslopt-longopts.h:
  Resolve conflict
include/sslopt-vars.h:
  Resolve conflict
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict

2006-05-19 16:17:24 -07:00

19 KiB

Raw Blame History

View Raw