← Back to branch summary

~vjsamuel/drizzle/bug-616035

« back to all changes in this revision

Viewing changes to storage/myisam/myisampack.c

  • Committer: Stewart Smith
  • Date: 2008-07-09 01:40:54 UTC
  • mfrom: (105 drizzle)
  • mto: This revision was merged to the branch mainline in revision 111.
  • Revision ID: stewart@flamingspork.com-20080709014054-xfgfzirbhqzrzkkj
merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/myisampack.c
23
23
#include <queues.h>
24
24
#include <my_tree.h>
25
25
#include "mysys_err.h"
26
 
#ifdef MSDOS
27
 
#include <io.h>
28
 
#endif
29
26
#ifndef __GNU_LIBRARY__
30
27
#define __GNU_LIBRARY__                 /* Skip warnings in getopt.h */
31
28
#endif
1909
1906
        return 1;
1910
1907
      huff_tree->code_len=(uchar*) (huff_tree->code+elements);
1911
1908
      make_traverse_code_tree(huff_tree, huff_tree->root,
1912
 
                              8 * sizeof(ulonglong), LL(0));
 
1909
                              8 * sizeof(ulonglong), 0LL);
1913
1910
    }
1914
1911
  }
1915
1912
  return 0;
3200
3197
          (**count1 > **count2) ? -1 : 0);
3201
3198
}
3202
3199
#endif
3203
 
 
3204
 
#include "mi_extrafunc.h"