Commit 44cdd695 authored by unknown's avatar unknown
Browse files

Merge rama.(none):/home/jimw/my/mysql-4.1-clean 

into  rama.(none):/home/jimw/my/mysql-5.0-clean


include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
include/my_sys.h:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Resolve conflict
sql/opt_range.cc:
  Resolve conflict
sql/sql_acl.cc:
  Resolve conflict
parents a59f477c 915bdfbe

include/m_ctype.h

+3 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ typedef struct my_charset_handler_st 
  

  /* Charset dependant snprintf() */

  int  (*snprintf)(struct charset_info_st *, char *to, uint n, const char *fmt,

		   ...);

		   ...) ATTRIBUTE_FORMAT(printf, 4, 5);

  int  (*long10_to_str)(struct charset_info_st *, char *to, uint n, int radix,

			long int val);

  int (*longlong10_to_str)(struct charset_info_st *, char *to, uint n,
@@ -319,7 +319,8 @@ int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e); 
ulong my_scan_8bit(CHARSET_INFO *cs, const char *b, const char *e, int sq);



int my_snprintf_8bit(struct charset_info_st *, char *to, uint n,

		     const char *fmt, ...);

		     const char *fmt, ...)

  ATTRIBUTE_FORMAT(printf, 4, 5);



long        my_strntol_8bit(CHARSET_INFO *, const char *s, uint l, int base,

			    char **e, int *err);

include/m_string.h

+2 −1
Original line number Diff line number Diff line
@@ -254,7 +254,8 @@ extern ulonglong strtoull(const char *str, char **ptr, int base); 


extern int my_vsnprintf( char *str, size_t n,

                                const char *format, va_list ap );

extern int my_snprintf(char* to, size_t n, const char* fmt, ...);

extern int my_snprintf(char *to, size_t n, const char *fmt, ...)

  ATTRIBUTE_FORMAT(printf, 3, 4);



#if defined(__cplusplus) && !defined(OS2)

}

include/my_global.h

+21 −1
Original line number Diff line number Diff line
@@ -454,14 +454,34 @@ typedef unsigned short ushort; 
#define function_volatile	volatile

#define my_reinterpret_cast(A) reinterpret_cast<A>

#define my_const_cast(A) const_cast<A>

# ifndef GCC_VERSION

#  define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)

# endif

#elif !defined(my_reinterpret_cast)

#define my_reinterpret_cast(A) (A)

#define my_const_cast(A) (A)

#endif

#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)



/*

  Disable __attribute__() on GCC < 2.7 and non-GCC compilers

*/

#if !defined(__attribute__) && (!defined(__GNUC__) || GCC_VERSION < 2007)

#define __attribute__(A)

#endif



/*

  __attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4

*/

#ifndef ATTRIBUTE_FORMAT

# if defined(__GNUC__) && \

     ((!defined(__cplusplus__) && GCC_VERSION >= 2008) || \

      GCC_VERSION >= 3004)

#  define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))

# else

#  define ATTRIBUTE_FORMAT(style, m, n)

# endif

#endif



/*

  Wen using the embedded library, users might run into link problems,

  duplicate declaration of __cxa_pure_virtual, solved by declaring it a

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ extern int my_sync(File fd, myf my_flags); 
extern int my_error _VARARGS((int nr,myf MyFlags, ...));

extern int my_printf_error _VARARGS((uint my_err, const char *format,

				     myf MyFlags, ...)

				    __attribute__ ((format (printf, 2, 4))));

				    ATTRIBUTE_FORMAT(printf, 2, 4);

extern int my_error_register(const char **errmsgs, int first, int last);

extern const char **my_error_unregister(int first, int last);

extern int my_message(uint my_err, const char *str,myf MyFlags);

sql/item_timefunc.cc

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static bool make_datetime(date_time_format_types format, TIME *ltime, 
			       ltime->hour, ltime->minute, ltime->second);

    break;

  case TIME_MICROSECOND:

    length= cs->cset->snprintf(cs, buff, length, "%s%02d:%02d:%02d.%06d",

    length= cs->cset->snprintf(cs, buff, length, "%s%02d:%02d:%02d.%06ld",

			       ltime->neg ? "-" : "",

			       ltime->hour, ltime->minute, ltime->second,

			       ltime->second_part);
@@ -82,7 +82,7 @@ static bool make_datetime(date_time_format_types format, TIME *ltime, 
    break;

  case DATE_TIME_MICROSECOND:

    length= cs->cset->snprintf(cs, buff, length,

			       "%04d-%02d-%02d %02d:%02d:%02d.%06d",

			       "%04d-%02d-%02d %02d:%02d:%02d.%06ld",

			       ltime->year, ltime->month, ltime->day,

			       ltime->hour, ltime->minute, ltime->second,

			       ltime->second_part);