← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_handler.c

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_handler.c
15
15
   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
16
16
   MA 02111-1307, USA */
17
17
 
18
 
#include <my_global.h>
19
 
#include <m_ctype.h>
20
 
#include <my_base.h>
 
18
#include "mysys_priv.h"
 
19
 
 
20
#include <mystrings/m_ctype.h>
 
21
#include <drizzled/base.h>
21
22
#include <my_handler.h>
22
23
#include <my_sys.h>
23
24
 
24
 
#include "mysys_priv.h"
25
25
#include "my_handler_errors.h"
26
26
 
27
27
int ha_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length,
124
124
               uint *diff_pos)
125
125
{
126
126
  int flag;
127
 
  int16 s_1,s_2;
128
 
  int32 l_1,l_2;
129
 
  uint32 u_1,u_2;
 
127
  int16_t s_1,s_2;
 
128
  int32_t l_1,l_2;
 
129
  uint32_t u_1,u_2;
130
130
  float f_1,f_2;
131
131
  double d_1,d_2;
132
132
  uint next_key_length;
293
293
      break;
294
294
    case HA_KEYTYPE_USHORT_INT:
295
295
      {
296
 
        uint16 us_1,us_2;
 
296
        uint16_t us_1,us_2;
297
297
        us_1= mi_sint2korr(a);
298
298
        us_2= mi_sint2korr(b);
299
299
        if (piks && (flag = CMP_NUM(us_1,us_2)))