diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-28 17:26:11 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-28 17:26:11 +0300 |
| commit | 7311cbe7dee5980d921ec43177fd268783eb18e2 (patch) | |
| tree | 27f0f967ee5f642c6cb7ecfab977612a3d7e57d3 /myisam/sort.c | |
| parent | a6ca5cbb9172ba7fb56834d78d6527525a59d1c3 (diff) | |
| download | mariadb-git-7311cbe7dee5980d921ec43177fd268783eb18e2.tar.gz | |
Updated windows files (VC++ files and winmysqladmin).
Portability fixes.
Removed compiler warnings.
VC++Files/client/mysql.dsp:
Updated to 4.0.2
VC++Files/client/mysqladmin.dsp:
Updated to 4.0.2
VC++Files/client/mysqlclient.dsp:
Updated to 4.0.2
VC++Files/client/mysqldump.dsp:
Updated to 4.0.2
VC++Files/client/mysqlimport.dsp:
Updated to 4.0.2
VC++Files/client/mysqlshow.dsp:
Updated to 4.0.2
VC++Files/innobase/innobase.dsp:
Updated to 4.0.2
VC++Files/libmysql/libmySQL.dsp:
Updated to 4.0.2
VC++Files/libmysqltest/myTest.dsp:
Updated to 4.0.2
VC++Files/merge/merge.dsp:
Updated to 4.0.2
VC++Files/myisam/myisam.dsp:
Updated to 4.0.2
VC++Files/mysql.dsw:
Updated to 4.0.2
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Updated to 4.0.2
VC++Files/mysqlcheck/mysqlcheck.dsp:
Updated to 4.0.2
VC++Files/mysqlmanager/MySqlManager.dsp:
Updated to 4.0.2
VC++Files/mysys/mysys.dsp:
Updated to 4.0.2
VC++Files/pack_isam/pack_isam.dsp:
Updated to 4.0.2
VC++Files/perror/perror.dsp:
Updated to 4.0.2
VC++Files/replace/replace.dsp:
Updated to 4.0.2
VC++Files/sql/mysqld.dsp:
Updated to 4.0.2
VC++Files/test1/test1.dsp:
Updated to 4.0.2
VC++Files/thr_insert_test/thr_insert_test.dsp:
Updated to 4.0.2
VC++Files/thr_test/thr_test.dsp:
Updated to 4.0.2
VC++Files/vio/vio.dsp:
Updated to 4.0.2
VC++Files/zlib/zlib.dsp:
Updated to 4.0.2
include/config-win.h:
Added isnan() and finite()
include/myisam.h:
Move thr_xxx functions to myisam_priv.h
myisam/mi_check.c:
Portability fix.
myisam/mi_locking.c:
Comment cleanup
myisam/myisamchk.c:
Removed compiler warning
myisam/myisamdef.h:
Added thr_xxx functions
myisam/sort.c:
Portability fix
sql/field.cc:
Portability fix
sql/sql_insert.cc:
R
Diffstat (limited to 'myisam/sort.c')
| -rw-r--r-- | myisam/sort.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index 65b606f7a68..e0851b062e1 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -277,8 +277,9 @@ static ha_rows NEAR_F find_all_keys(MI_SORT_PARAM *info, uint keys, /* Search after all keys and place them in a temp. file */ -void *_thr_find_all_keys(MI_SORT_PARAM *info) +pthread_handler_decl(thr_find_all_keys,arg) { + MI_SORT_PARAM *info= (MI_SORT_PARAM*) arg; int error; uint memavl,old_memavl,keys,sort_length; uint idx, maxbuffer; @@ -401,10 +402,10 @@ ok: pthread_cond_signal(&info->sort_info->cond); pthread_mutex_unlock(&info->sort_info->mutex); return NULL; -} /* _thr_find_all_keys */ +} -int _thr_write_keys(MI_SORT_PARAM *sort_param) +int thr_write_keys(MI_SORT_PARAM *sort_param) { SORT_INFO *sort_info=sort_param->sort_info; MI_CHECK *param=sort_info->param; |