diff options
| author | unknown <joerg@trift2.> | 2006-11-10 15:52:53 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2006-11-10 15:52:53 +0100 |
| commit | 744aadbef906aa778999ac53e795f7df22a7a247 (patch) | |
| tree | 0a11e30278864276807eadc44cc3365f32c48046 /myisam | |
| parent | 1cb38d3be6afd4100d0ed0c1ab001b394189785b (diff) | |
| parent | a033047b79d0caf6fc14a0761f85ef77899af673 (diff) | |
| download | mariadb-git-744aadbef906aa778999ac53e795f7df22a7a247.tar.gz | |
Merge trift2.:/MySQL/M41/clone-4.1
into trift2.:/MySQL/M41/push-4.1
myisam/sort.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Manual merge.
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/sort.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index c5686a8e22c..fe9459e572b 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -315,6 +315,7 @@ pthread_handler_decl(thr_find_all_keys,arg) uint memavl,old_memavl,keys,sort_length; uint idx, maxbuffer; uchar **sort_keys=0; + DBUG_ENTER("thr_find_all_keys"); /* FIXME why no matching DBUG_RETURN ? */ LINT_INIT(keys); @@ -322,8 +323,9 @@ pthread_handler_decl(thr_find_all_keys,arg) if (my_thread_init()) goto err; - DBUG_ENTER("thr_find_all_keys"); + DBUG_PRINT("enter", ("master: %d", sort_param->master)); + if (sort_param->sort_info->got_error) goto err; |