diff options
| author | unknown <monty@mysql.com> | 2004-03-29 19:21:53 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-29 19:21:53 +0300 |
| commit | ff908d18a27247c3b4206ce49977c4a7c73792be (patch) | |
| tree | f51ea3945f84d672edc962cdfc11eab16f569fc5 /mysql-test/t/bdb-crash.test | |
| parent | 883215956e1597c7432cb79a68b510a4c0f7c9c2 (diff) | |
| parent | 501c3e7a0e1770aa7b40a2b1c19b8e89388b834f (diff) | |
| download | mariadb-git-ff908d18a27247c3b4206ce49977c4a7c73792be.tar.gz | |
Merge with 4.0 to get lastest bug fixes
include/m_string.h:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/r/bdb-crash.result:
Auto merged
sql/handler.h:
Auto merged
mysql-test/r/grant_cache.result:
Auto merged
mysql-test/t/grant_cache.test:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_table.cc:
Auto merged
innobase/mem/mem0dbg.c:
Merge with 4.0
mysql-test/r/myisam.result:
Merge with 4.0
mysql-test/r/order_by.result:
Merge with 4.0
mysql-test/t/bdb-crash.test:
Merge with 4.0
mysql-test/t/myisam.test:
Merge with 4.0
mysql-test/t/order_by.test:
Merge with 4.0
sql/ha_berkeley.cc:
Merge with 4.0 (use local code)
sql/sql_select.cc:
Merge with 4.0 to get fix for FORCE INDEX ... ORDER BY
Diffstat (limited to 'mysql-test/t/bdb-crash.test')
| -rw-r--r-- | mysql-test/t/bdb-crash.test | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/t/bdb-crash.test b/mysql-test/t/bdb-crash.test index cea69df6993..3cd78821000 100644 --- a/mysql-test/t/bdb-crash.test +++ b/mysql-test/t/bdb-crash.test @@ -39,8 +39,7 @@ drop table t1; # # Test for bug #2342 "Running ANALYZE TABLE on bdb table -# inside a transaction hangs server thread" -# +# inside a transaction hangs server thread" create table t1 (a int) engine=bdb; @@ -48,4 +47,3 @@ set autocommit=0; insert into t1 values(1); analyze table t1; drop table t1; - |