← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_dynrec.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_dynrec.cc
33
33
#endif
34
34
#include <drizzled/util/test.h>
35
35
 
 
36
#include <cassert>
36
37
#include <algorithm>
37
38
 
38
39
using namespace std;
48
49
                                 ulong reclength);
49
50
static int delete_dynamic_record(MI_INFO *info,my_off_t filepos,
50
51
                                 uint32_t second_read);
51
 
static int _mi_cmp_buffer(File file, const unsigned char *buff, my_off_t filepos,
 
52
static int _mi_cmp_buffer(int file, const unsigned char *buff, my_off_t filepos,
52
53
                          uint32_t length);
53
54
 
54
55
        /* Interface function from MI_INFO */
1401
1402
  uint32_t b_type, left_length= 0;
1402
1403
  unsigned char *to= NULL;
1403
1404
  MI_BLOCK_INFO block_info;
1404
 
  File file;
 
1405
  int file;
1405
1406
 
1406
1407
  if (filepos != HA_OFFSET_ERROR)
1407
1408
  {
1603
1604
 
1604
1605
        /* Compare file to buffert */
1605
1606
 
1606
 
static int _mi_cmp_buffer(File file, const unsigned char *buff, my_off_t filepos,
 
1607
static int _mi_cmp_buffer(int file, const unsigned char *buff, my_off_t filepos,
1607
1608
                          uint32_t length)
1608
1609
{
1609
1610
  uint32_t next_length;
1833
1834
 
1834
1835
        /* Read and process header from a dynamic-record-file */
1835
1836
 
1836
 
uint32_t _mi_get_block_info(MI_BLOCK_INFO *info, File file, my_off_t filepos)
 
1837
uint32_t _mi_get_block_info(MI_BLOCK_INFO *info, int file, my_off_t filepos)
1837
1838
{
1838
1839
  uint32_t return_val=0;
1839
1840
  unsigned char *header=info->header;