Commit 4a974740 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


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

mysql-test/t/heap_btree.test

+1 −1
Original line number Diff line number Diff line
@@ -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