Commit 287b027e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/gluh/MySQL/Merge/4.1 

into  mysql.com:/home/gluh/MySQL/Merge/4.1-kt


include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
parents 568eeb26 5549ed3a

.bzrignore

+7 −3
Original line number Diff line number Diff line 
*.Plo

*.Po

*.a

*.bb

*.bbg
@@ -11,6 +13,8 @@ 
*.reject

*.spec

*/*_pure_*warnings

*/.deps

*/.libs/*

*/.pure

*~

.*.swp
@@ -336,6 +340,7 @@ isam/test2 
isam/test3

libmysql/*.c

libmysql/conf_to_src

libmysql/libmysql.ver

libmysql/my_static.h

libmysql/my_time.c

libmysql/mysys_priv.h
@@ -443,6 +448,7 @@ libmysqld/sql_insert.cc 
libmysqld/sql_lex.cc

libmysqld/sql_list.cc

libmysqld/sql_load.cc

libmysqld/sql_locale.cc

libmysqld/sql_manager.cc

libmysqld/sql_map.cc

libmysqld/sql_olap.cc
@@ -519,6 +525,7 @@ mysql-4.1.8-win-src.zip 
mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz

mysql-test/gmon.out

mysql-test/install_test_db

mysql-test/mtr

mysql-test/mysql-test-run

mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new
@@ -1057,6 +1064,3 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl
 
libmysql/libmysql.ver

libmysqld/sql_locale.cc

mysql-test/mtr

client/mysql.cc

+2 −2
Original line number Diff line number Diff line
@@ -2629,7 +2629,7 @@ com_connect(String *buffer, char *line) 
  bzero(buff, sizeof(buff));

  if (buffer)

  {

    strmov(buff, line);

    strmake(buff, line, sizeof(buff) - 1);

    tmp= get_arg(buff, 0);

    if (tmp && *tmp)

    {
@@ -2743,7 +2743,7 @@ com_use(String *buffer __attribute__((unused)), char *line) 
  char *tmp, buff[FN_REFLEN + 1];



  bzero(buff, sizeof(buff));

  strmov(buff, line);

  strmake(buff, line, sizeof(buff) - 1);

  tmp= get_arg(buff, 0);

  if (!tmp || !*tmp)

  {

include/m_ctype.h

+3 −2
Original line number Diff line number Diff line
@@ -178,7 +178,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_FPTR(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,
@@ -304,7 +304,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
@@ -247,7 +247,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

+40 −2
Original line number Diff line number Diff line
@@ -414,14 +414,52 @@ 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, g++ < 3.4, and non-gcc compilers.

  Some forms of __attribute__ are actually supported in earlier versions of

  g++, but we just disable them all because we only use them to generate

  compilation warnings.

*/

#ifndef __attribute__

# if !defined(__GNUC__)

#  define __attribute__(A)

# elif GCC_VERSION < 2008

#  define __attribute__(A)

# elif defined(__cplusplus) && GCC_VERSION < 3004

#  define __attribute__(A)

# endif

#endif



/*

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

  But that's already covered by the __attribute__ tests above, so this is

  just a convenience macro.

*/

#ifndef ATTRIBUTE_FORMAT

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

#endif



/*

   __attribute__((format(...))) on a function pointer is not supported

   until  gcc 3.1

*/

#ifndef ATTRIBUTE_FORMAT_FPTR

# if (GCC_VERSION >= 3001)

#  define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n)

# else

#  define ATTRIBUTE_FORMAT_FPTR(style, m, n)

# endif /* GNUC >= 3.1 */

#endif





/* From old s-system.h */



/*