← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/myisamchk.c

  • Committer: Brian Aker
  • Date: 2008-10-06 06:47:29 UTC
  • Revision ID: brian@tangent.org-20081006064729-2i9mhjkzyvow9xsm
Remove uint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/myisamchk.c
35
35
 
36
36
#include "myisamdef.h"
37
37
 
38
 
static uint decode_bits;
 
38
static uint32_t decode_bits;
39
39
static char **default_argv;
40
40
static const char *load_default_groups[]= { "myisamchk", 0 };
41
41
static const char *set_collation_name, *opt_tmpdir;
71
71
static int myisamchk(MI_CHECK *param, char *filename);
72
72
static void descript(MI_CHECK *param, register MI_INFO *info, char * name);
73
73
static int mi_sort_records(MI_CHECK *param, register MI_INFO *info,
74
 
                           char * name, uint sort_key,
 
74
                           char * name, uint32_t sort_key,
75
75
                           bool write_info, bool update_index);
76
76
static int sort_record_index(MI_SORT_PARAM *sort_param, MI_INFO *info,
77
77
                             MI_KEYDEF *keyinfo,
78
 
                             my_off_t page,unsigned char *buff,uint sortkey,
 
78
                             my_off_t page,unsigned char *buff,uint32_t sortkey,
79
79
                             File new_file, bool update_index);
80
80
 
81
81
MI_CHECK check_param;
106
106
        (!(check_param.testflag & (T_REP | T_REP_BY_SORT | T_SORT_RECORDS |
107
107
                                   T_SORT_INDEX))))
108
108
    {
109
 
      uint old_testflag=check_param.testflag;
 
109
      uint32_t old_testflag=check_param.testflag;
110
110
      if (!(check_param.testflag & T_REP))
111
111
        check_param.testflag|= T_REP_BY_SORT;
112
112
      check_param.testflag&= ~T_EXTEND;                 /* Don't needed  */
753
753
{
754
754
  int error,lock_type,recreate;
755
755
  int rep_quick= param->testflag & (T_QUICK | T_FORCE_UNIQUENESS);
756
 
  uint raid_chunks;
 
756
  uint32_t raid_chunks;
757
757
  MI_INFO *info;
758
758
  File datafile;
759
759
  char llbuff[22],llbuff2[22];
973
973
      }
974
974
      if (!error && param->testflag & T_SORT_RECORDS)
975
975
      {
976
 
        uint key;
 
976
        uint32_t key;
977
977
        /*
978
978
          We can't update the index in mi_sort_records if we have a
979
979
          prefix compressed or fulltext index
1132
1132
 
1133
1133
static void descript(MI_CHECK *param, register MI_INFO *info, char * name)
1134
1134
{
1135
 
  uint key,keyseg_nr,field,start;
 
1135
  uint32_t key,keyseg_nr,field,start;
1136
1136
  register MI_KEYDEF *keyinfo;
1137
1137
  register HA_KEYSEG *keyseg;
1138
1138
  register const char *text;
1395
1395
 
1396
1396
static int mi_sort_records(MI_CHECK *param,
1397
1397
                           register MI_INFO *info, char * name,
1398
 
                           uint sort_key,
 
1398
                           uint32_t sort_key,
1399
1399
                           bool write_info,
1400
1400
                           bool update_index)
1401
1401
{
1402
1402
  int got_error;
1403
 
  uint key;
 
1403
  uint32_t key;
1404
1404
  MI_KEYDEF *keyinfo;
1405
1405
  File new_file;
1406
1406
  unsigned char *temp_buff;
1571
1571
 
1572
1572
static int sort_record_index(MI_SORT_PARAM *sort_param,MI_INFO *info,
1573
1573
                             MI_KEYDEF *keyinfo,
1574
 
                             my_off_t page, unsigned char *buff, uint sort_key,
 
1574
                             my_off_t page, unsigned char *buff, uint32_t sort_key,
1575
1575
                             File new_file,bool update_index)
1576
1576
{
1577
1577
  uint  nod_flag,used_length,key_length;