diff options
| author | unknown <istruewing@chilla.local> | 2007-03-28 17:06:09 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-03-28 17:06:09 +0200 |
| commit | a470f42a25ea824a4506b99884330239b5c04ce0 (patch) | |
| tree | 50398b724c4b2cfd81089fc1a659d0ed7007e88d /mysql-test/t/heap_btree.test | |
| parent | fd3431798390c24521de442de63b31e620a13ba6 (diff) | |
| parent | 660cb2fdea23bbea8c5d94f257e53d1fd6dd31ab (diff) | |
| download | mariadb-git-a470f42a25ea824a4506b99884330239b5c04ce0.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/heap_btree.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysys/thr_alarm.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item_func.cc:
Auto merged
storage/heap/hp_write.c:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_range.c:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
sql/mysqld.cc:
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 a8c0c5ce353..4e7102806d6 100644 --- a/mysql-test/t/heap_btree.test +++ b/mysql-test/t/heap_btree.test @@ -236,3 +236,4 @@ INSERT INTO t1 VALUES(NULL),(NULL); DROP TABLE t1; --echo End of 5.0 tests + |