Commit 8628f2c8 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/t/mysqltest.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
client/mysqltest.c:
  Manual merge
sql/hostname.cc:
  Manual merge
parents b025657b 745181ce

There are no changes