diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-03 17:53:10 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-03 17:53:10 +0100 |
| commit | c88ab7a093c07be904398981fc8f42291bab08ff (patch) | |
| tree | d4a92bb02e385733a39810b432e6eb04abd1d3bc /storage | |
| parent | 7bc532ae636951f49e3c3e9c6a556a9410366f97 (diff) | |
| parent | 62150851430d046a1ddd9ec7fe4941c30d451995 (diff) | |
| download | mariadb-git-c88ab7a093c07be904398981fc8f42291bab08ff.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
mysys/my_lock.c:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/sort.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/sort.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c index da9a3178618..a6bf3934959 100644 --- a/storage/myisam/sort.c +++ b/storage/myisam/sort.c @@ -323,7 +323,6 @@ pthread_handler_t thr_find_all_keys(void *arg) if (my_thread_init()) goto err; - { /* Add extra block since DBUG_ENTER declare variables */ DBUG_ENTER("thr_find_all_keys"); DBUG_PRINT("enter", ("master: %d", sort_param->master)); |