diff options
| author | unknown <tsmith@maint2.mysql.com> | 2006-09-01 03:44:03 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint2.mysql.com> | 2006-09-01 03:44:03 +0200 |
| commit | fc5ee96866474662d32ae8bb5f388cccf17b1806 (patch) | |
| tree | ec15d05401311d504740ff6b571513a12e678717 /mysql-test/t/heap_btree.test | |
| parent | b0cdb895e4154d3d131268d8181193bad82086c2 (diff) | |
| parent | a756f762e868c73ac9e90ebadfd51f1c3d905499 (diff) | |
| download | mariadb-git-fc5ee96866474662d32ae8bb5f388cccf17b1806.tar.gz | |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/41
into maint2.mysql.com:/data/localhome/tsmith/bk/50
mysql-test/r/heap_btree.result:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/t/heap_btree.test:
Manual merge.
Diffstat (limited to 'mysql-test/t/heap_btree.test')
| -rw-r--r-- | mysql-test/t/heap_btree.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/heap_btree.test b/mysql-test/t/heap_btree.test index e74e9723ca6..03ba8661a3c 100644 --- a/mysql-test/t/heap_btree.test +++ b/mysql-test/t/heap_btree.test @@ -204,3 +204,4 @@ CREATE TABLE t1 (a INT, UNIQUE USING BTREE(a)) ENGINE=MEMORY; INSERT INTO t1 VALUES(NULL),(NULL); DROP TABLE t1; +--echo End of 5.0 tests |