← Back to branch summary

~mysql/mysql-server/mysql-6.0

« back to all changes in this revision

Viewing changes to myisam/myisampack.c

Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
myisam/myisampack.c
763
763
        if (count->tree_buff)
764
764
        {
765
765
          global_count=count;
766
 
          if (!(element=tree_insert(&count->int_tree,pos,0)) ||
 
766
          if (!(element=tree_insert(&count->int_tree,pos, 0, 
 
767
                                    count->int_tree.custom_arg)) ||
767
768
              (element->count == 1 &&
768
769
               count->tree_buff + tree_buff_length <
769
770
               count->tree_pos + count->field_length) ||
1786
1787
          break;
1787
1788
        case FIELD_INTERVALL:
1788
1789
          global_count=count;
1789
 
          pos=(byte*) tree_search(&count->int_tree,start_pos);
 
1790
          pos=(byte*) tree_search(&count->int_tree, start_pos,
 
1791
                                  count->int_tree.custom_arg);
1790
1792
          intervall=(uint) (pos - count->tree_buff)/field_length;
1791
1793
          write_bits(tree->code[intervall],(uint) tree->code_len[intervall]);
1792
1794
          start_pos=end_pos;