Commit e64f4fde authored by unknown's avatar unknown

Merge trift2.:/MySQL/M50/tmp-5.0

into  trift2.:/MySQL/M51/push-5.1


mysys/my_read.c:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Null merge.
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Null merge.
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Null merge.
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Null merge.
BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
  Null merge.
scripts/make_binary_distribution.sh:
  Null merge, this change is already suppressed in 4.1.
support-files/MySQL-shared-compat.spec.sh:
  Null merge, this change is already suppressed in 4.1.
parents 98cd24b3 8a7c1142
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment