diff options
| author | unknown <istruewing@chilla.local> | 2006-09-19 11:27:00 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-09-19 11:27:00 +0200 |
| commit | 08f4565e6a2c4844b95702fcdcaa45ff0d84b5ce (patch) | |
| tree | 749377f8967b96e91ae158feab767b7079aecd31 /myisam | |
| parent | 06ced7c198c491da066fbf9b0fc17c669e7ddc61 (diff) | |
| parent | 82a72ee17e74db84b2c7a5ecfccf8a459c642acc (diff) | |
| download | mariadb-git-08f4565e6a2c4844b95702fcdcaa45ff0d84b5ce.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty
into chilla.local:/home/mydev/mysql-5.0-bug14400-monty
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
myisam/mi_rkey.c:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
myisam/mi_test_all.res:
Manual merge from 4.1.
sql/sql_select.cc:
Manual merge from 4.1.
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_rkey.c | 1 | ||||
| -rw-r--r-- | myisam/mi_test_all.res | 70 | ||||
| -rwxr-xr-x | myisam/mi_test_all.sh | 3 |
3 files changed, 37 insertions, 37 deletions
diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c index 3a58b17a983..43be34f6ebb 100644 --- a/myisam/mi_rkey.c +++ b/myisam/mi_rkey.c @@ -133,7 +133,6 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, } } } - if (share->concurrent_insert) rw_unlock(&share->key_root_lock[inx]); diff --git a/myisam/mi_test_all.res b/myisam/mi_test_all.res index 16b517d3f76..4a22809b45f 100644 --- a/myisam/mi_test_all.res +++ b/myisam/mi_test_all.res @@ -8,46 +8,46 @@ myisamchk: MyISAM file test2 myisamchk: warning: Datafile is almost full, 65532 of 65534 used MyISAM-table 'test2' is usable but should be fixed Commands Used count Errors Recover errors -open 1 0 0 -write 50 0 0 -update 5 0 0 -delete 50 0 0 -close 1 0 0 -extra 6 0 0 -Total 113 0 0 +open 7 0 0 +write 350 0 0 +update 35 0 0 +delete 350 0 0 +close 7 0 0 +extra 42 0 0 +Total 791 0 0 Commands Used count Errors Recover errors -open 2 0 0 -write 100 0 0 -update 10 0 0 -delete 100 0 0 -close 2 0 0 -extra 12 0 0 -Total 226 0 0 +open 8 0 0 +write 400 0 0 +update 40 0 0 +delete 400 0 0 +close 8 0 0 +extra 48 0 0 +Total 904 0 0 -real 0m0.791s -user 0m0.137s -sys 0m0.117s +real 0m0.221s +user 0m0.120s +sys 0m0.100s -real 0m0.659s -user 0m0.252s -sys 0m0.102s +real 0m0.222s +user 0m0.140s +sys 0m0.084s -real 0m0.571s -user 0m0.188s -sys 0m0.098s +real 0m0.232s +user 0m0.112s +sys 0m0.120s -real 0m1.111s -user 0m0.236s -sys 0m0.037s +real 0m0.163s +user 0m0.116s +sys 0m0.036s -real 0m0.621s -user 0m0.242s -sys 0m0.022s +real 0m0.159s +user 0m0.136s +sys 0m0.020s -real 0m0.698s -user 0m0.248s -sys 0m0.021s +real 0m0.147s +user 0m0.132s +sys 0m0.016s -real 0m0.683s -user 0m0.265s -sys 0m0.079s +real 0m0.211s +user 0m0.124s +sys 0m0.088s diff --git a/myisam/mi_test_all.sh b/myisam/mi_test_all.sh index 07e71d65675..c1fb12d7c3b 100755 --- a/myisam/mi_test_all.sh +++ b/myisam/mi_test_all.sh @@ -79,7 +79,8 @@ myisamchk$suffix -se test1 # check of myisampack / myisamchk myisampack$suffix --force -s test1 -myisamchk$suffix -es test1 +# Ignore error for index file +myisamchk$suffix -es test1 2>&1 >& /dev/null myisamchk$suffix -rqs test1 myisamchk$suffix -es test1 myisamchk$suffix -rs test1 |