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 /include/myisam.h | |
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 'include/myisam.h')
-rw-r--r-- | include/myisam.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/myisam.h b/include/myisam.h index 32e9225efdf..9b5d21a1844 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -351,6 +351,7 @@ typedef struct st_mi_check_param char *op_name; } MI_CHECK; + typedef struct st_sort_info { MI_INFO *info; @@ -368,6 +369,7 @@ typedef struct st_sort_info pthread_cond_t cond; } SORT_INFO; + typedef struct st_mi_sort_param { pthread_t thr; @@ -391,6 +393,7 @@ typedef struct st_mi_sort_param void (*lock_in_memory)(MI_CHECK *); } MI_SORT_PARAM; + /* functions in mi_check */ void myisamchk_init(MI_CHECK *param); int chk_status(MI_CHECK *param, MI_INFO *info); @@ -422,8 +425,6 @@ int movepoint(MI_INFO *info,byte *record,my_off_t oldpos, int sort_write_record(MI_SORT_PARAM *sort_param); int write_data_suffix(SORT_INFO *sort_info, my_bool fix_datafile); int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, ulong); -void *_thr_find_all_keys(MI_SORT_PARAM *info); -int _thr_write_keys(MI_SORT_PARAM *sort_param); int test_if_almost_full(MI_INFO *info); int recreate_table(MI_CHECK *param, MI_INFO **org_info, char *filename); void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows); |