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

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


mysql-test/r/heap_btree.result:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/t/heap_btree.test:
  Manually merged.

mysql-test/t/heap_btree.test

@@ -216,4 +216,4 @@ delete from t1 where a >= 2;
 select a from t1 order by a;
 drop table t1;
 
---echo End of 4.1 tests
+--echo End of 5.0 tests