Commit 78b4ddbe authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/M41/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
parents 4b47cc97 1275b4c5

include/m_string.h

+3 −0
Original line number Diff line number Diff line
@@ -238,6 +238,9 @@ longlong my_strtoll10(const char *nptr, char **endptr, int *error); 
#ifndef HAVE_STRTOULL

#define HAVE_STRTOULL

#endif

#ifndef HAVE_STRTOLL

#define HAVE_STRTOLL

#endif

#else

#ifdef HAVE_LONG_LONG

extern char *longlong2str(longlong val,char *dst,int radix);

strings/strto.c

+6 −2
Original line number Diff line number Diff line
@@ -35,8 +35,12 @@ 
  it can be compiled with the UNSIGNED and/or LONGLONG flag set

*/



#include <my_global.h>

#include "m_string.h"



#if !defined(_global_h) || !defined(_m_string_h)

#  error  Calling file must include 'my_global.h' and 'm_string.h'

   /* see 'strtoll.c' and 'strtoull.c' for the reasons */

#endif



#include "m_ctype.h"

#include "my_sys.h"			/* defines errno */

#include <errno.h>

strings/strtol.c

+8 −1
Original line number Diff line number Diff line
@@ -14,9 +14,16 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



/* This defines strtol() if neaded */

/* This implements strtol() if needed */



/*

   These includes are mandatory because they check for type sizes and

   functions, especially they handle tricks for Tru64 where 'long' is

   64 bit already and our 'longlong' is just a 'long'.

 */

#include <my_global.h>

#include <m_string.h>



#if !defined(MSDOS) && !defined(HAVE_STRTOL) && !defined(__WIN__)

#include "strto.c"

#endif

strings/strtoll.c

+11 −2
Original line number Diff line number Diff line
@@ -14,11 +14,20 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



/* This is defines strtoll() if neaded */

/* This implements strtoll() if needed */



#define strtoll glob_strtoll		/* Fix for True64 */



/*

   These includes are mandatory because they check for type sizes and

   functions, especially they handle tricks for Tru64 where 'long' is

   64 bit already and our 'longlong' is just a 'long'.

   This solves a problem on Tru64 where the C99 compiler has a prototype

   for 'strtoll()' but no implementation, see "6.1 New C99 library functions" 

   in file '/usr/share/doclib/cc.dtk/release_notes.txt'.

 */

#include <my_global.h>

#include <m_string.h>



#if !defined(HAVE_STRTOLL) && defined(HAVE_LONG_LONG)

#define USE_LONGLONG

#include "strto.c"

strings/strtoul.c

+8 −1
Original line number Diff line number Diff line
@@ -14,9 +14,16 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



/* This is defines strtoul() if neaded */

/* This implements strtol() if needed */



/*

   These includes are mandatory because they check for type sizes and

   functions, especially they handle tricks for Tru64 where 'long' is

   64 bit already and our 'longlong' is just a 'long'.

 */

#include <my_global.h>

#include <m_string.h>



#if !defined(MSDOS) && !defined(HAVE_STRTOUL)

#define USE_UNSIGNED

#include "strto.c"