unknown 79ae20bc3a Merge mysql.com:/home/jimw/my/mysql-4.1-clean ...

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


mysql-test/t/variables.test:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
scripts/mysqld_multi.sh:
  Resolve conflict

2005-09-02 12:42:00 -07:00

12 KiB

Raw Blame History

View Raw