diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-03-26 18:37:38 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-03-26 18:37:38 +0200 |
| commit | 9630bdffddc52d9ecd2e9ccab1c492756f07076d (patch) | |
| tree | 007e99eab2948fed93bba975a04801b24ba9c92a /myisam | |
| parent | c8bdced21469ec1777abfea13662becc66944919 (diff) | |
| parent | 221dfec1a4fb2a7208d9ae88eaa151857e95486c (diff) | |
| download | mariadb-git-9630bdffddc52d9ecd2e9ccab1c492756f07076d.tar.gz | |
Merge with 4.0.13
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
myisam/sort.c:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/update.result:
Auto merged
mysql-test/t/bdb-crash.test:
Auto merged
mysql-test/t/group_by.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
mysql-test/t/type_ranges.test:
Auto merged
mysql-test/t/update.test:
Auto merged
sql-bench/crash-me.sh:
Auto merged
client/mysql.cc:
Keep old code
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 6 | ||||
| -rw-r--r-- | myisam/sort.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index a55096dd061..73bdcea9cc3 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -2096,7 +2096,7 @@ err: Threaded repair of table using sorting SYNOPSIS - mi_repair_by_sort_parallel() + mi_repair_parallel() param Repair parameters info MyISAM handler to repair name Name of table (for warnings) @@ -2115,6 +2115,9 @@ err: int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, const char * name, int rep_quick) { +#ifndef THREAD + return mi_repair_by_sort(param, info, name, rep_quick); +#else int got_error; uint i,key, total_key_length, istep; ulong rec_length; @@ -2485,6 +2488,7 @@ err: share->pack.header_length=0; } DBUG_RETURN(got_error); +#endif /* THREAD */ } /* Read next record and return next key */ diff --git a/myisam/sort.c b/myisam/sort.c index 006b96cfaab..09e487e1165 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -297,6 +297,7 @@ static ha_rows NEAR_F find_all_keys(MI_SORT_PARAM *info, uint keys, } /* find_all_keys */ +#ifdef THREAD /* Search after all keys and place them in a temp. file */ pthread_handler_decl(thr_find_all_keys,arg) @@ -590,6 +591,7 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) my_free((gptr) mergebuf,MYF(MY_ALLOW_ZERO_PTR)); return got_error; } +#endif /* THREAD */ /* Write all keys in memory to file for later merge */ |