diff options
| author | unknown <istruewing@chilla.local> | 2007-03-28 10:25:51 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-03-28 10:25:51 +0200 |
| commit | 5cf5779af1526afb33f793a83b32ce2578bb8534 (patch) | |
| tree | 30c163f57ab3f949c896a693bc9d0500cca73aa4 /mysql-test/t/heap_btree.test | |
| parent | fe6a7bdbe31700861124c88c4b506aa402dddd4a (diff) | |
| parent | f6eca60afb461fddfe7ccd0096a48a4631489c75 (diff) | |
| download | mariadb-git-5cf5779af1526afb33f793a83b32ce2578bb8534.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into chilla.local:/home/mydev/mysql-5.0-axmrg
myisam/mi_range.c:
Auto merged
myisam/mi_search.c:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.cc:
Auto merged
mysql-test/r/myisam.result:
Manual merge from 4.1
mysql-test/t/heap_btree.test:
Manual merge from 4.1
Diffstat (limited to 'mysql-test/t/heap_btree.test')
| -rw-r--r-- | mysql-test/t/heap_btree.test | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/t/heap_btree.test b/mysql-test/t/heap_btree.test index af8f9d9c9e8..8d0c17c8ef5 100644 --- a/mysql-test/t/heap_btree.test +++ b/mysql-test/t/heap_btree.test @@ -235,4 +235,3 @@ 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 |