Commit 5eaa8cef authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 58c3d0ab 9cba39ca

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -344,6 +344,10 @@ SOURCE=..\mysys\my_alloc.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_decimal.cpp

# End Source File

# Begin Source File



SOURCE=..\mysys\my_getopt.c

# End Source File

# Begin Source File

VC++Files/sql/mysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -1085,6 +1085,10 @@ SOURCE=.\mf_iocache.cpp 
# End Source File

# Begin Source File



SOURCE=.\my_decimal.cpp

# End Source File

# Begin Source File



SOURCE=.\my_time.c

# End Source File

# Begin Source File

VC++Files/strings/strings.dsp

+4 −0
Original line number Diff line number Diff line
@@ -177,6 +177,10 @@ SOURCE=.\ctype.c 
# End Source File

# Begin Source File



SOURCE=.\decimal.c

# End Source File

# Begin Source File



SOURCE=.\int2str.c

# End Source File

# Begin Source File

include/config-win.h

+3 −3
Original line number Diff line number Diff line
@@ -310,9 +310,6 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_SETFILEPOINTER

#define HAVE_VIO



#define HAME_MMAP               /* in mysys/my_mmap.c */

#define HAVE_GETPAGESIZE        /* in mysys/my_mmap.c */



#ifdef NOT_USED

#define HAVE_SNPRINTF		/* Gave link error */

#define _snprintf snprintf
@@ -353,6 +350,8 @@ inline double ulonglong2double(ulonglong value) 


#define DO_NOT_REMOVE_THREAD_WRAPPERS

#define thread_safe_increment(V,L) InterlockedIncrement((long*) &(V))

#define thread_safe_decrement(V,L) InterlockedDecrement((long*) &(V))

#define thread_safe_dec_and_test(V, L) thread_safe_decrement(V,L)

/* The following is only used for statistics, so it should be good enough */

#ifdef __NT__  /* This should also work on Win98 but .. */

#define thread_safe_add(V,C,L) InterlockedExchangeAdd((long*) &(V),(C))
@@ -366,6 +365,7 @@ inline double ulonglong2double(ulonglong value) 
#define statistic_add(V,C,L)	 (V)+=(C)

#endif

#define statistic_increment(V,L) thread_safe_increment((V),(L))

#define statistic_decrement(V,L) thread_safe_decrement((V),(L))



#define shared_memory_buffer_length 16000

#define default_shared_memory_base_name "MYSQL"

include/decimal.h

+9 −4
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
#ifndef _decimal_h

#define _decimal_h



typedef enum {TRUNCATE=0, HALF_EVEN, HALF_UP, CEILING, FLOOR} decimal_round_mode;

typedef enum

{TRUNCATE=0, HALF_EVEN, HALF_UP, CEILING, FLOOR}

  decimal_round_mode;

typedef int32 decimal_digit;



typedef struct st_decimal {
@@ -26,11 +28,10 @@ typedef struct st_decimal { 
  decimal_digit *buf;

} decimal;



int internal_str2dec(const char *from, decimal *to, char **end, my_bool fixed);

int decimal2string(decimal *from, char *to, int *to_len,

                   int fixed_precision, int fixed_decimals,

                   char filler);

int string2decimal(char *from, decimal *to, char **end);

int string2decimal_fixed(char *from, decimal *to, char **end);

int decimal2ulonglong(decimal *from, ulonglong *to);

int ulonglong2decimal(ulonglong from, decimal *to);

int decimal2longlong(decimal *from, longlong *to);
@@ -51,10 +52,14 @@ int decimal_cmp(decimal *from1, decimal *from2); 
int decimal_mul(decimal *from1, decimal *from2, decimal *to);

int decimal_div(decimal *from1, decimal *from2, decimal *to, int scale_incr);

int decimal_mod(decimal *from1, decimal *from2, decimal *to);

int decimal_round(decimal *from, decimal *to, int new_scale, decimal_round_mode mode);

int decimal_round(decimal *from, decimal *to, int new_scale,

                  decimal_round_mode mode);

int decimal_is_zero(decimal *from);

void max_decimal(int precision, int frac, decimal *to);



#define string2decimal(A,B,C) internal_str2dec((A), (B), (C), 0)

#define string2decimal_fixed(A,B,C) internal_str2dec((A), (B), (C), 1)



/* set a decimal to zero */



#define decimal_make_zero(dec)        do {                \