diff options
| author | lars@mysql.com/black.(none) <> | 2006-11-13 12:44:24 +0100 |
|---|---|---|
| committer | lars@mysql.com/black.(none) <> | 2006-11-13 12:44:24 +0100 |
| commit | de01754c19c9eefff9a26975b7a232f82a123eb1 (patch) | |
| tree | e99fb242630be9fe65dd9345a43d79338971cca6 /myisam | |
| parent | 5a20c542013f2dd4be99bcc020d4dbe4523678ff (diff) | |
| parent | cddbb0f8173800fd8431be4df178bc042702b9eb (diff) | |
| download | mariadb-git-de01754c19c9eefff9a26975b7a232f82a123eb1.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1-rpl
into mysql.com:/home/bk/MERGE/mysql-4.1-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; |