Commit 89667ffe authored by unknown's avatar unknown

Merge four.local.lan:/work/merge/mysql-4.1-dev

into  four.local.lan:/work/merge/mysql-5.0-dev


BitKeeper/deleted/.del-disabled.def:
  SCCS merged
mysql-test/r/rpl000015.result:
  Bug does not apply to 5.0 and up
mysql-test/t/rpl000015.test:
  Bug does not apply to 5.0 and up.
parents 77f59b98 56b00941
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