unknown ffc086e60a Merge mysql.com:/home/jimw/my/mysql-5.0-11680 ...

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


configure.in:
  Auto merged
sql/hostname.cc:
  Resolve conflict

2005-08-24 15:54:23 -07:00

..

charsets

Merge mysql.com:/home/gluh/MySQL/Merge/4.1

2005-07-21 17:55:16 +05:00

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

errmsg.txt

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

2005-08-23 09:15:05 +04:00

Makefile.am

Fix build using --without-server. (Bug #11680)

2005-08-23 11:25:24 -07:00