diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 17:46:36 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 17:46:36 -0400 |
| commit | 4a974740d60cc1485ab49387ddb254d86dd11128 (patch) | |
| tree | 05e13e5403454be3c04e1185f42d1eeaeb9fa1e1 /mysql-test/t/heap_btree.test | |
| parent | a7a605cb592c7e396542154f532d4d7a932f1de1 (diff) | |
| parent | fc5ee96866474662d32ae8bb5f388cccf17b1806 (diff) | |
| download | mariadb-git-4a974740d60cc1485ab49387ddb254d86dd11128.tar.gz | |
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.
Diffstat (limited to 'mysql-test/t/heap_btree.test')
| -rw-r--r-- | mysql-test/t/heap_btree.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/heap_btree.test b/mysql-test/t/heap_btree.test index 931d4e40d3e..12c911aa9c9 100644 --- a/mysql-test/t/heap_btree.test +++ b/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 |