Commit 42902831 authored by unknown's avatar unknown

Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


mysql-test/r/range.result:
  Auto merged
sql/item.cc:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  SCCS merged
parents 5eeee409 23bd0ead
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