← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unireg.cc

  • Committer: Brian Aker
  • Date: 2008-08-10 16:57:26 UTC
  • Revision ID: brian@tangent.org-20080810165726-mc1660l11a5vkv69
libdrizzle has ulong removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/unireg.cc
28
28
 
29
29
#define FCOMP                   17              /* Bytes for a packed field */
30
30
 
31
 
static unsigned char * pack_screens(List<Create_field> &create_fields,
32
 
                            uint32_t *info_length, uint32_t *screens, bool small_file);
33
 
static uint32_t pack_keys(unsigned char *keybuff,uint32_t key_count, KEY *key_info,
 
31
static uchar * pack_screens(List<Create_field> &create_fields,
 
32
                            uint *info_length, uint *screens, bool small_file);
 
33
static uint pack_keys(uchar *keybuff,uint key_count, KEY *key_info,
34
34
                      ulong data_offset);
35
 
static bool pack_header(unsigned char *forminfo,
 
35
static bool pack_header(uchar *forminfo,enum legacy_db_type table_type,
36
36
                        List<Create_field> &create_fields,
37
 
                        uint32_t info_length, uint32_t screens, uint32_t table_options,
 
37
                        uint info_length, uint screens, uint table_options,
38
38
                        ulong data_offset, handler *file);
39
 
static uint32_t get_interval_id(uint32_t *int_count,List<Create_field> &create_fields,
 
39
static uint get_interval_id(uint *int_count,List<Create_field> &create_fields,
40
40
                            Create_field *last_field);
41
41
static bool pack_fields(File file, List<Create_field> &create_fields,
42
42
                        ulong data_offset);
43
43
static bool make_empty_rec(THD *thd, int file, enum legacy_db_type table_type,
44
 
                           uint32_t table_options,
 
44
                           uint table_options,
45
45
                           List<Create_field> &create_fields,
46
 
                           uint32_t reclength, ulong data_offset,
 
46
                           uint reclength, ulong data_offset,
47
47
                           handler *handler);
48
48
 
49
49
/**
55
55
 
56
56
struct Pack_header_error_handler: public Internal_error_handler
57
57
{
58
 
  virtual bool handle_error(uint32_t sql_errno,
 
58
  virtual bool handle_error(uint sql_errno,
59
59
                            const char *message,
60
60
                            DRIZZLE_ERROR::enum_warning_level level,
61
61
                            THD *thd);
66
66
 
67
67
bool
68
68
Pack_header_error_handler::
69
 
handle_error(uint32_t sql_errno,
 
69
handle_error(uint sql_errno,
70
70
             const char * /* message */,
71
71
             DRIZZLE_ERROR::enum_warning_level /* level */,
72
72
             THD * /* thd */)
99
99
                      const char *db, const char *table,
100
100
                      HA_CREATE_INFO *create_info,
101
101
                      List<Create_field> &create_fields,
102
 
                      uint32_t keys, KEY *key_info,
 
102
                      uint keys, KEY *key_info,
103
103
                      handler *db_file)
104
104
{
105
105
  LEX_STRING str_db_type;
106
 
  uint32_t reclength, info_length, screens, key_info_length, maxlength, tmp_len;
 
106
  uint reclength, info_length, screens, key_info_length, maxlength, tmp_len;
107
107
  ulong key_buff_length;
108
108
  File file;
109
109
  ulong filepos, data_offset;
110
 
  unsigned char fileinfo[64],forminfo[288],*keybuff;
 
110
  uchar fileinfo[64],forminfo[288],*keybuff;
111
111
  TYPELIB formnames;
112
 
  unsigned char *screen_buff;
 
112
  uchar *screen_buff;
113
113
  char buff[128];
114
 
  const uint32_t format_section_header_size= 8;
115
 
  uint32_t format_section_len;
 
114
  const uint format_section_header_size= 8;
 
115
  uint format_section_len;
116
116
  Pack_header_error_handler pack_header_error_handler;
117
117
  int error;
118
118
 
129
129
 
130
130
  thd->push_internal_handler(&pack_header_error_handler);
131
131
 
132
 
  error= pack_header(forminfo,
 
132
  error= pack_header(forminfo, ha_legacy_type(create_info->db_type),
133
133
                     create_fields,info_length,
134
134
                     screens, create_info->table_options,
135
135
                     data_offset, db_file);
138
138
 
139
139
  if (error)
140
140
  {
141
 
    free(screen_buff);
 
141
    my_free(screen_buff, MYF(0));
142
142
    if (! pack_header_error_handler.is_handled)
143
143
      return(1);
144
144
 
145
145
    // Try again without UNIREG screens (to get more columns)
146
146
    if (!(screen_buff=pack_screens(create_fields,&info_length,&screens,1)))
147
147
      return(1);
148
 
    if (pack_header(forminfo,
 
148
    if (pack_header(forminfo, ha_legacy_type(create_info->db_type),
149
149
                    create_fields,info_length,
150
150
                    screens, create_info->table_options, data_offset, db_file))
151
151
    {
152
 
      free(screen_buff);
 
152
      my_free(screen_buff, MYF(0));
153
153
      return(1);
154
154
    }
155
155
  }
184
184
  if (tmp_len < create_info->comment.length)
185
185
  {
186
186
    my_error(ER_WRONG_STRING_LENGTH, MYF(0),
187
 
             create_info->comment.str,"Table COMMENT",
 
187
             create_info->comment.str,"TABLE COMMENT",
188
188
             (uint) TABLE_COMMENT_MAXLEN);
189
 
    free(screen_buff);
 
189
    my_free(screen_buff,MYF(0));
190
190
    return(1);
191
191
  }
192
192
 
199
199
  else{
200
200
    strmake((char*) forminfo+47, create_info->comment.str ?
201
201
            create_info->comment.str : "", create_info->comment.length);
202
 
    forminfo[46]=(unsigned char) create_info->comment.length;
 
202
    forminfo[46]=(uchar) create_info->comment.length;
203
203
#ifdef EXTRA_DEBUG
204
204
    /*
205
205
      EXTRA_DEBUG causes strmake() to initialize its buffer behind the
213
213
  if ((file=create_frm(thd, file_name, db, table, reclength, fileinfo,
214
214
                       create_info, keys, key_info)) < 0)
215
215
  {
216
 
    free(screen_buff);
 
216
    my_free(screen_buff, MYF(0));
217
217
    return(1);
218
218
  }
219
219
 
220
220
  key_buff_length= uint4korr(fileinfo+47);
221
 
  keybuff=(unsigned char*) my_malloc(key_buff_length, MYF(0));
 
221
  keybuff=(uchar*) my_malloc(key_buff_length, MYF(0));
222
222
  key_info_length= pack_keys(keybuff, keys, key_info, data_offset);
223
 
  get_form_pos(file,fileinfo,&formnames);
 
223
  VOID(get_form_pos(file,fileinfo,&formnames));
224
224
  if (!(filepos=make_new_entry(file,fileinfo,&formnames,"")))
225
225
    goto err;
226
226
  maxlength=(uint) next_io_size((ulong) (uint2korr(forminfo)+1000));
227
227
  int2store(forminfo+2,maxlength);
228
228
  int4store(fileinfo+10,(ulong) (filepos+maxlength));
229
 
  fileinfo[26]= (unsigned char) test((create_info->max_rows == 1) &&
 
229
  fileinfo[26]= (uchar) test((create_info->max_rows == 1) &&
230
230
                             (create_info->min_rows == 1) && (keys == 0));
231
231
  int2store(fileinfo+28,key_info_length);
232
232
 
236
236
  if (pwrite(file, fileinfo, 64, 0L) == 0 ||
237
237
      pwrite(file, keybuff, key_info_length, (ulong) uint2korr(fileinfo+6)) == 0)
238
238
    goto err;
239
 
  my_seek(file,
 
239
  VOID(my_seek(file,
240
240
               (ulong) uint2korr(fileinfo+6)+ (ulong) key_buff_length,
241
 
               MY_SEEK_SET,MYF(0));
 
241
               MY_SEEK_SET,MYF(0)));
242
242
  if (make_empty_rec(thd,file,ha_legacy_type(create_info->db_type),
243
243
                     create_info->table_options,
244
244
                     create_fields,reclength, data_offset, db_file))
245
245
    goto err;
246
246
 
247
247
  int2store(buff, create_info->connect_string.length);
248
 
  if (my_write(file, (const unsigned char*)buff, 2, MYF(MY_NABP)) ||
249
 
      my_write(file, (const unsigned char*)create_info->connect_string.str,
 
248
  if (my_write(file, (const uchar*)buff, 2, MYF(MY_NABP)) ||
 
249
      my_write(file, (const uchar*)create_info->connect_string.str,
250
250
               create_info->connect_string.length, MYF(MY_NABP)))
251
251
      goto err;
252
252
 
253
253
  int2store(buff, str_db_type.length);
254
 
  if (my_write(file, (const unsigned char*)buff, 2, MYF(MY_NABP)) ||
255
 
      my_write(file, (const unsigned char*)str_db_type.str,
 
254
  if (my_write(file, (const uchar*)buff, 2, MYF(MY_NABP)) ||
 
255
      my_write(file, (const uchar*)str_db_type.str,
256
256
               str_db_type.length, MYF(MY_NABP)))
257
257
    goto err;
258
258
 
259
259
  {
260
260
    memset(buff, 0, 6);
261
 
    if (my_write(file, (unsigned char*) buff, 6, MYF_RW))
 
261
    if (my_write(file, (uchar*) buff, 6, MYF_RW))
262
262
      goto err;
263
263
  }
264
264
 
265
 
  if (forminfo[46] == (unsigned char)255)
 
265
  if (forminfo[46] == (uchar)255)
266
266
  {
267
 
    unsigned char comment_length_buff[2];
 
267
    uchar comment_length_buff[2];
268
268
    int2store(comment_length_buff,create_info->comment.length);
269
269
    if (my_write(file, comment_length_buff, 2, MYF(MY_NABP)) ||
270
 
        my_write(file, (unsigned char*)create_info->comment.str,
 
270
        my_write(file, (uchar*)create_info->comment.str,
271
271
                  create_info->comment.length, MYF(MY_NABP)))
272
272
      goto err;
273
273
  }
276
276
  {
277
277
    /* prepare header */
278
278
    {
279
 
      uint32_t flags= 0;
 
279
      uint flags= 0;
280
280
 
281
281
      memset(buff, 0, format_section_header_size);
282
282
      /* length of section 2 bytes*/
286
286
      /* 2 bytes left for future use */
287
287
    }
288
288
    /* write header */
289
 
    if (my_write(file, (const unsigned char*)buff, format_section_header_size, MYF_RW))
 
289
    if (my_write(file, (const uchar*)buff, format_section_header_size, MYF_RW))
290
290
      goto err;
291
291
    buff[0]= 0;
292
 
    if (my_write(file, (const unsigned char*)buff, 1, MYF_RW))
 
292
    if (my_write(file, (const uchar*)buff, 1, MYF_RW))
293
293
      goto err;
294
294
    /* write column info, 1 byte per column */
295
295
    {
296
296
      List_iterator<Create_field> it(create_fields);
297
297
      Create_field *field;
298
 
      unsigned char column_format, write_byte;
 
298
      uchar column_format, write_byte;
299
299
      while ((field=it++))
300
300
      {
301
 
        column_format= (unsigned char)field->column_format();
 
301
        column_format= (uchar)field->column_format();
302
302
        write_byte= (column_format << COLUMN_FORMAT_SHIFT);
303
303
        if (my_write(file, &write_byte, 1, MYF_RW))
304
304
          goto err;
305
305
      }
306
306
    }
307
307
  }
308
 
  my_seek(file,filepos,MY_SEEK_SET,MYF(0));
 
308
  VOID(my_seek(file,filepos,MY_SEEK_SET,MYF(0)));
309
309
  if (my_write(file, forminfo, 288, MYF_RW) ||
310
310
      my_write(file, screen_buff, info_length, MYF_RW) ||
311
311
      pack_fields(file, create_fields, data_offset))
312
312
    goto err;
313
313
 
314
 
  free(screen_buff);
315
 
  free(keybuff);
 
314
  my_free(screen_buff,MYF(0));
 
315
  my_free(keybuff, MYF(0));
316
316
 
317
 
  if (!(create_info->options & HA_LEX_CREATE_TMP_TABLE) &&
 
317
  if (opt_sync_frm && !(create_info->options & HA_LEX_CREATE_TMP_TABLE) &&
318
318
      (my_sync(file, MYF(MY_WME)) ||
319
319
       my_sync_dir_by_file(file_name, MYF(MY_WME))))
320
320
      goto err2;
341
341
  return(0);
342
342
 
343
343
err:
344
 
  free(screen_buff);
345
 
  free(keybuff);
 
344
  my_free(screen_buff, MYF(0));
 
345
  my_free(keybuff, MYF(0));
346
346
err2:
347
 
  my_close(file,MYF(MY_WME));
 
347
  VOID(my_close(file,MYF(MY_WME)));
348
348
err3:
349
349
  my_delete(file_name,MYF(0));
350
350
  return(1);
375
375
                     const char *db, const char *table_name,
376
376
                     HA_CREATE_INFO *create_info,
377
377
                     List<Create_field> &create_fields,
378
 
                     uint32_t keys, KEY *key_info, handler *file)
 
378
                     uint keys, KEY *key_info, handler *file)
379
379
{
380
380
  
381
381
 
382
382
  char frm_name[FN_REFLEN];
383
 
  strxmov(frm_name, path, reg_ext, NULL);
 
383
  strxmov(frm_name, path, reg_ext, NullS);
384
384
  if (mysql_create_frm(thd, frm_name, db, table_name, create_info,
385
385
                       create_fields, keys, key_info, file))
386
386
 
398
398
  return(0);
399
399
 
400
400
err_handler:
401
 
  file->ha_create_handler_files(path, NULL, CHF_DELETE_FLAG, create_info);
 
401
  VOID(file->ha_create_handler_files(path, NULL, CHF_DELETE_FLAG, create_info));
402
402
  my_delete(frm_name, MYF(0));
403
403
  return(1);
404
404
} /* rea_create_table */
406
406
 
407
407
        /* Pack screens to a screen for save in a form-file */
408
408
 
409
 
static unsigned char *pack_screens(List<Create_field> &create_fields,
410
 
                           uint32_t *info_length, uint32_t *screens,
 
409
static uchar *pack_screens(List<Create_field> &create_fields,
 
410
                           uint *info_length, uint *screens,
411
411
                           bool small_file)
412
412
{
413
 
  register uint32_t i;
414
 
  uint32_t row,start_row,end_row,fields_on_screen;
415
 
  uint32_t length,cols;
416
 
  unsigned char *info,*pos,*start_screen;
417
 
  uint32_t fields=create_fields.elements;
 
413
  register uint i;
 
414
  uint row,start_row,end_row,fields_on_screen;
 
415
  uint length,cols;
 
416
  uchar *info,*pos,*start_screen;
 
417
  uint fields=create_fields.elements;
418
418
  List_iterator<Create_field> it(create_fields);
419
419
  
420
420
 
427
427
  while ((field=it++))
428
428
    length+=(uint) strlen(field->field_name)+1+TE_INFO_LENGTH+cols/2;
429
429
 
430
 
  if (!(info=(unsigned char*) my_malloc(length,MYF(MY_WME))))
 
430
  if (!(info=(uchar*) my_malloc(length,MYF(MY_WME))))
431
431
    return(0);
432
432
 
433
433
  start_screen=0;
443
443
      {
444
444
        length=(uint) (pos-start_screen);
445
445
        int2store(start_screen,length);
446
 
        start_screen[2]=(unsigned char) (fields_on_screen+1);
447
 
        start_screen[3]=(unsigned char) (fields_on_screen);
 
446
        start_screen[2]=(uchar) (fields_on_screen+1);
 
447
        start_screen[3]=(uchar) (fields_on_screen);
448
448
      }
449
449
      row=start_row;
450
450
      start_screen=pos;
451
451
      pos+=4;
452
 
      pos[0]= (unsigned char) start_row-2;      /* Header string */
453
 
      pos[1]= (unsigned char) (cols >> 2);
454
 
      pos[2]= (unsigned char) (cols >> 1) +1;
 
452
      pos[0]= (uchar) start_row-2;      /* Header string */
 
453
      pos[1]= (uchar) (cols >> 2);
 
454
      pos[2]= (uchar) (cols >> 1) +1;
455
455
      strfill((char *) pos+3,(uint) (cols >> 1),' ');
456
456
      pos+=(cols >> 1)+4;
457
457
    }
461
461
 
462
462
    if (!small_file)
463
463
    {
464
 
      pos[0]=(unsigned char) row;
 
464
      pos[0]=(uchar) row;
465
465
      pos[1]=0;
466
 
      pos[2]=(unsigned char) (length+1);
467
 
      pos=(unsigned char*) strmake((char*) pos+3,cfield->field_name,length)+1;
 
466
      pos[2]=(uchar) (length+1);
 
467
      pos=(uchar*) strmake((char*) pos+3,cfield->field_name,length)+1;
468
468
    }
469
469
    cfield->row=(uint8_t) row;
470
470
    cfield->col=(uint8_t) (length+1);
471
 
    cfield->sc_length=(uint8_t) cmin(cfield->length,(uint32_t)cols-(length+2));
 
471
    cfield->sc_length=(uint8_t) min(cfield->length,cols-(length+2));
472
472
  }
473
473
  length=(uint) (pos-start_screen);
474
474
  int2store(start_screen,length);
475
 
  start_screen[2]=(unsigned char) (row-start_row+2);
476
 
  start_screen[3]=(unsigned char) (row-start_row+1);
 
475
  start_screen[2]=(uchar) (row-start_row+2);
 
476
  start_screen[3]=(uchar) (row-start_row+1);
477
477
 
478
478
  *info_length=(uint) (pos-info);
479
479
  return(info);
482
482
 
483
483
        /* Pack keyinfo and keynames to keybuff for save in form-file. */
484
484
 
485
 
static uint32_t pack_keys(unsigned char *keybuff, uint32_t key_count, KEY *keyinfo,
 
485
static uint pack_keys(uchar *keybuff, uint key_count, KEY *keyinfo,
486
486
                      ulong data_offset)
487
487
{
488
 
  uint32_t key_parts,length;
489
 
  unsigned char *pos, *keyname_pos;
 
488
  uint key_parts,length;
 
489
  uchar *pos, *keyname_pos;
490
490
  KEY *key,*end;
491
491
  KEY_PART_INFO *key_part,*key_part_end;
492
492
  
497
497
  {
498
498
    int2store(pos, (key->flags ^ HA_NOSAME));
499
499
    int2store(pos+2,key->key_length);
500
 
    pos[4]= (unsigned char) key->key_parts;
501
 
    pos[5]= (unsigned char) key->algorithm;
 
500
    pos[4]= (uchar) key->key_parts;
 
501
    pos[5]= (uchar) key->algorithm;
502
502
    int2store(pos+6, key->block_size);
503
503
    pos+=8;
504
504
    key_parts+=key->key_parts;
507
507
         key_part++)
508
508
 
509
509
    {
510
 
      uint32_t offset;
 
510
      uint offset;
511
511
      int2store(pos,key_part->fieldnr+1+FIELD_NAME_USED);
512
512
      offset= (uint) (key_part->offset+data_offset+1);
513
513
      int2store(pos+2, offset);
519
519
  }
520
520
        /* Save keynames */
521
521
  keyname_pos=pos;
522
 
  *pos++=(unsigned char) NAMES_SEP_CHAR;
 
522
  *pos++=(uchar) NAMES_SEP_CHAR;
523
523
  for (key=keyinfo ; key != end ; key++)
524
524
  {
525
 
    unsigned char *tmp=(unsigned char*) my_stpcpy((char*) pos,key->name);
526
 
    *tmp++= (unsigned char) NAMES_SEP_CHAR;
 
525
    uchar *tmp=(uchar*) stpcpy((char*) pos,key->name);
 
526
    *tmp++= (uchar) NAMES_SEP_CHAR;
527
527
    *tmp=0;
528
528
    pos=tmp;
529
529
  }
534
534
    if (key->flags & HA_USES_COMMENT)
535
535
    {
536
536
      int2store(pos, key->comment.length);
537
 
      unsigned char *tmp= (unsigned char*)my_stpncpy((char*) pos+2,key->comment.str,key->comment.length);
 
537
      uchar *tmp= (uchar*)stpncpy((char*) pos+2,key->comment.str,key->comment.length);
538
538
      pos= tmp;
539
539
    }
540
540
  }
547
547
  }
548
548
  else
549
549
  {
550
 
    keybuff[0]=(unsigned char) key_count;
551
 
    keybuff[1]=(unsigned char) key_parts;
 
550
    keybuff[0]=(uchar) key_count;
 
551
    keybuff[1]=(uchar) key_parts;
552
552
    keybuff[2]= keybuff[3]= 0;
553
553
  }
554
554
  length=(uint) (pos-keyname_pos);
559
559
 
560
560
/* Make formheader */
561
561
 
562
 
static bool pack_header(unsigned char *forminfo,
 
562
static bool pack_header(uchar *forminfo,
 
563
                        enum legacy_db_type table_type __attribute__((unused)),
563
564
                        List<Create_field> &create_fields,
564
 
                        uint32_t info_length, uint32_t screens, uint32_t table_options,
 
565
                        uint info_length, uint screens, uint table_options,
565
566
                        ulong data_offset, handler *file)
566
567
{
567
 
  uint32_t length,int_count,int_length,no_empty, int_parts;
568
 
  uint32_t time_stamp_pos,null_fields;
 
568
  uint length,int_count,int_length,no_empty, int_parts;
 
569
  uint time_stamp_pos,null_fields;
569
570
  ulong reclength, totlength, n_length, com_length;
570
571
 
571
572
 
587
588
  Create_field *field;
588
589
  while ((field=it++))
589
590
  {
590
 
    uint32_t tmp_len= system_charset_info->cset->charpos(system_charset_info,
 
591
    uint tmp_len= system_charset_info->cset->charpos(system_charset_info,
591
592
                                                     field->comment.str,
592
593
                                                     field->comment.str +
593
594
                                                     field->comment.length,
628
629
    field->save_interval= 0;
629
630
    if (field->interval)
630
631
    {
631
 
      uint32_t old_int_count=int_count;
 
632
      uint old_int_count=int_count;
632
633
 
633
634
      if (field->charset->mbminlen > 1)
634
635
      {
648
649
                                    (field->interval->count+1));
649
650
        field->interval->type_names[field->interval->count]= 0;
650
651
        field->interval->type_lengths=
651
 
          (uint32_t *) sql_alloc(sizeof(uint) * field->interval->count);
 
652
          (uint *) sql_alloc(sizeof(uint) * field->interval->count);
652
653
 
653
 
        for (uint32_t pos= 0; pos < field->interval->count; pos++)
 
654
        for (uint pos= 0; pos < field->interval->count; pos++)
654
655
        {
655
656
          char *dst;
656
657
          const char *src= field->save_interval->type_names[pos];
657
 
          uint32_t hex_length;
 
658
          uint hex_length;
658
659
          length= field->save_interval->type_lengths[pos];
659
660
          hex_length= length * 2;
660
661
          field->interval->type_lengths[pos]= hex_length;
685
686
    return(1);
686
687
  }
687
688
  /* Hack to avoid bugs with small static rows in MySQL */
688
 
  reclength=cmax((ulong)file->min_record_length(table_options),reclength);
 
689
  reclength=max(file->min_record_length(table_options),reclength);
689
690
  if (info_length+(ulong) create_fields.elements*FCOMP+288+
690
691
      n_length+int_length+com_length > 65535L || int_count > 255)
691
692
  {
719
720
 
720
721
        /* get each unique interval each own id */
721
722
 
722
 
static uint32_t get_interval_id(uint32_t *int_count,List<Create_field> &create_fields,
 
723
static uint get_interval_id(uint *int_count,List<Create_field> &create_fields,
723
724
                            Create_field *last_field)
724
725
{
725
726
  List_iterator<Create_field> it(create_fields);
750
751
static bool pack_fields(File file, List<Create_field> &create_fields,
751
752
                        ulong data_offset)
752
753
{
753
 
  register uint32_t i;
754
 
  uint32_t int_count, comment_length=0;
755
 
  unsigned char buff[MAX_FIELD_WIDTH];
 
754
  register uint i;
 
755
  uint int_count, comment_length=0;
 
756
  uchar buff[MAX_FIELD_WIDTH];
756
757
  Create_field *field;
757
758
  
758
759
 
763
764
  int_count=0;
764
765
  while ((field=it++))
765
766
  {
766
 
    uint32_t recpos;
767
 
    buff[0]= (unsigned char) field->row;
768
 
    buff[1]= (unsigned char) field->col;
769
 
    buff[2]= (unsigned char) field->sc_length;
 
767
    uint recpos;
 
768
    buff[0]= (uchar) field->row;
 
769
    buff[1]= (uchar) field->col;
 
770
    buff[2]= (uchar) field->sc_length;
770
771
    int2store(buff+3, field->length);
771
772
    /* The +1 is here becasue the col offset in .frm file have offset 1 */
772
773
    recpos= field->offset+1 + (uint) data_offset;
773
774
    int3store(buff+5,recpos);
774
775
    int2store(buff+8,field->pack_flag);
775
776
    int2store(buff+10,field->unireg_check);
776
 
    buff[12]= (unsigned char) field->interval_id;
777
 
    buff[13]= (unsigned char) field->sql_type; 
 
777
    buff[12]= (uchar) field->interval_id;
 
778
    buff[13]= (uchar) field->sql_type; 
778
779
    if (field->charset) 
779
 
      buff[14]= (unsigned char) field->charset->number;
 
780
      buff[14]= (uchar) field->charset->number;
780
781
    else
781
782
      buff[14]= 0;                              // Numerical
782
783
    int2store(buff+15, field->comment.length);
787
788
  }
788
789
 
789
790
        /* Write fieldnames */
790
 
  buff[0]=(unsigned char) NAMES_SEP_CHAR;
 
791
  buff[0]=(uchar) NAMES_SEP_CHAR;
791
792
  if (my_write(file, buff, 1, MYF_RW))
792
793
    return(1);
793
794
  i=0;
794
795
  it.rewind();
795
796
  while ((field=it++))
796
797
  {
797
 
    char *pos= my_stpcpy((char*) buff,field->field_name);
 
798
    char *pos= stpcpy((char*) buff,field->field_name);
798
799
    *pos++=NAMES_SEP_CHAR;
799
800
    if (i == create_fields.elements-1)
800
801
      *pos++=0;
816
817
      {
817
818
        unsigned char  sep= 0;
818
819
        unsigned char  occ[256];
819
 
        uint32_t           i;
 
820
        uint           i;
820
821
        unsigned char *val= NULL;
821
822
 
822
823
        memset(occ, 0, sizeof(occ));
823
824
 
824
825
        for (i=0; (val= (unsigned char*) field->interval->type_names[i]); i++)
825
 
          for (uint32_t j = 0; j < field->interval->type_lengths[i]; j++)
 
826
          for (uint j = 0; j < field->interval->type_lengths[i]; j++)
826
827
            occ[(unsigned int) (val[j])]= 1;
827
828
 
828
829
        if (!occ[(unsigned char)NAMES_SEP_CHAR])
831
832
          sep= ',';
832
833
        else
833
834
        {
834
 
          for (uint32_t i=1; i<256; i++)
 
835
          for (uint i=1; i<256; i++)
835
836
          {
836
837
            if(!occ[i])
837
838
            {
858
859
        tmp.append('\0');                      // End of intervall
859
860
      }
860
861
    }
861
 
    if (my_write(file,(unsigned char*) tmp.ptr(),tmp.length(),MYF_RW))
 
862
    if (my_write(file,(uchar*) tmp.ptr(),tmp.length(),MYF_RW))
862
863
      return(1);
863
864
  }
864
865
  if (comment_length)
868
869
    while ((field=it++))
869
870
    {
870
871
      if (field->comment.length)
871
 
        if (my_write(file, (unsigned char*) field->comment.str, field->comment.length,
 
872
        if (my_write(file, (uchar*) field->comment.str, field->comment.length,
872
873
                     MYF_RW))
873
874
          return(1);
874
875
    }
881
882
 
882
883
static bool make_empty_rec(THD *thd, File file,
883
884
                           enum legacy_db_type table_type __attribute__((unused)),
884
 
                           uint32_t table_options,
 
885
                           uint table_options,
885
886
                           List<Create_field> &create_fields,
886
 
                           uint32_t reclength,
 
887
                           uint reclength,
887
888
                           ulong data_offset,
888
889
                           handler *handler)
889
890
{
890
891
  int error= 0;
891
892
  Field::utype type;
892
 
  uint32_t null_count;
893
 
  unsigned char *buff,*null_pos;
894
 
  Table table;
 
893
  uint null_count;
 
894
  uchar *buff,*null_pos;
 
895
  TABLE table;
895
896
  TABLE_SHARE share;
896
897
  Create_field *field;
897
898
  enum_check_fields old_count_cuted_fields= thd->count_cuted_fields;
902
903
  memset(&share, 0, sizeof(share));
903
904
  table.s= &share;
904
905
 
905
 
  if (!(buff=(unsigned char*) my_malloc((size_t) reclength,MYF(MY_WME | MY_ZEROFILL))))
 
906
  if (!(buff=(uchar*) my_malloc((size_t) reclength,MYF(MY_WME | MY_ZEROFILL))))
906
907
  {
907
908
    return(1);
908
909
  }
987
988
    of 8 there are no unused bits.
988
989
  */
989
990
  if (null_count & 7)
990
 
    *(null_pos + null_count / 8)|= ~(((unsigned char) 1 << (null_count & 7)) - 1);
 
991
    *(null_pos + null_count / 8)|= ~(((uchar) 1 << (null_count & 7)) - 1);
991
992
 
992
993
  error= my_write(file, buff, (size_t) reclength,MYF_RW) != 0;
993
994
 
994
995
err:
995
 
  free(buff);
 
996
  my_free(buff, MYF(MY_FAE));
996
997
  thd->count_cuted_fields= old_count_cuted_fields;
997
998
  return(error);
998
999
} /* make_empty_rec */