Commit 40f8bb4f authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/set_var.cc:
  Manual merge.
parents 1ad1ee30 bb3efba0

There are no changes