Commit a6acc446 authored by unknown's avatar unknown
Browse files

Merge with 4.1 


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysys/default.c:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged
mysql-test/r/cast.result:
  Merge
mysql-test/t/cast.test:
  Merge
sql/sql_insert.cc:
  Merge
sql/sql_select.cc:
  Merge
parents e64d221e 3b604387

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ dlenev@build.mysql.com 
dlenev@jabberwock.localdomain

dlenev@mysql.com

ejonore@mc03.ndb.mysql.com

evgen@moonbone.(none)

evgen@moonbone.local

gbichot@production.mysql.com

gbichot@quadita2.mysql.com

gbichot@quadxeon.mysql.com

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -1798,6 +1798,9 @@ If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try 
again]);

fi

fi

AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])

AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])



MYSQL_PTHREAD_YIELD



######################################################################

include/config-win.h

+15 −2
Original line number Diff line number Diff line
@@ -106,20 +106,33 @@ functions */ 


/* Type information */



#if defined(__EMX__) || !defined(HAVE_UINT)

#undef HAVE_UINT

#define HAVE_UINT

typedef unsigned short	ushort;

typedef unsigned int	uint;

#endif /* defined(__EMX__) || !defined(HAVE_UINT) */



typedef unsigned __int64 ulonglong;	/* Microsofts 64 bit types */

typedef __int64 longlong;

#ifndef HAVE_SIGSET_T

typedef int sigset_t;

#endif

#define longlong_defined

/* off_t should not be __int64 because of conflicts in header files;

   Use my_off_t or os_off_t instead */

/*

  off_t should not be __int64 because of conflicts in header files;

  Use my_off_t or os_off_t instead

*/

#ifndef HAVE_OFF_T

typedef long off_t;

#endif

typedef __int64 os_off_t;

#ifdef _WIN64

typedef UINT_PTR rf_SetTimer;

#else

#ifndef HAVE_SIZE_T

typedef unsigned int size_t;

#endif

typedef uint rf_SetTimer;

#endif

include/my_global.h

+2 −0
Original line number Diff line number Diff line
@@ -425,6 +425,8 @@ int __void__; 
#endif



#if defined(__EMX__) || !defined(HAVE_UINT)

#undef HAVE_UINT

#define HAVE_UINT

typedef unsigned int uint;

typedef unsigned short ushort;

#endif

mysql-test/r/cast.result

+68 −3
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ CAST(1-2 AS UNSIGNED) 
select CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER);

CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER)

-1

select CONVERT('-1',UNSIGNED);

CONVERT('-1',UNSIGNED)

18446744073709551615

select CAST('10 ' as unsigned integer);

CAST('10 ' as unsigned integer)

10
@@ -100,6 +97,41 @@ select 10E+0+'a'; 
10

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'a'

select cast('18446744073709551616' as unsigned);

cast('18446744073709551616' as unsigned)

18446744073709551615

Warnings:

Warning	1292	Truncated incorrect INTEGER value: '18446744073709551616'

select cast('18446744073709551616' as signed);

cast('18446744073709551616' as signed)

-1

Warnings:

Warning	1292	Truncated incorrect INTEGER value: '18446744073709551616'

select cast('9223372036854775809' as signed);

cast('9223372036854775809' as signed)

-9223372036854775807

Warnings:

Warning	1105	Cast to signed converted positive out-of-range integer to it's negative complement

select cast('-1' as unsigned);

cast('-1' as unsigned)

18446744073709551615

Warnings:

Warning	1105	Cast to unsigned converted negative integer to it's positive complement

select cast('abc' as signed);

cast('abc' as signed)

0

Warnings:

Warning	1292	Truncated incorrect INTEGER value: 'abc'

select cast('1a' as signed);

cast('1a' as signed)

1

Warnings:

Warning	1292	Truncated incorrect INTEGER value: '1a'

select cast('' as signed);

cast('' as signed)

0

Warnings:

Warning	1292	Truncated incorrect INTEGER value: ''

set names binary;

select cast(_latin1'test' as char character set latin2);

cast(_latin1'test' as char character set latin2)
@@ -255,6 +287,39 @@ timediff(cast('2004-12-30 12:00:00' as time), '12:00:00') 
select timediff(cast('1 12:00:00' as time), '12:00:00');

timediff(cast('1 12:00:00' as time), '12:00:00')

24:00:00

select cast(18446744073709551615 as unsigned);

cast(18446744073709551615 as unsigned)

18446744073709551615

select cast(18446744073709551615 as signed);

cast(18446744073709551615 as signed)

-1

select cast('18446744073709551615' as unsigned);

cast('18446744073709551615' as unsigned)

18446744073709551615

select cast('18446744073709551615' as signed);

cast('18446744073709551615' as signed)

-1

Warnings:

Warning	1105	Cast to signed converted positive out-of-range integer to it's negative complement

select cast('9223372036854775807' as signed);

cast('9223372036854775807' as signed)

9223372036854775807

select cast(concat('184467440','73709551615') as unsigned);

cast(concat('184467440','73709551615') as unsigned)

18446744073709551615

select cast(concat('184467440','73709551615') as signed);

cast(concat('184467440','73709551615') as signed)

-1

Warnings:

Warning	1105	Cast to signed converted positive out-of-range integer to it's negative complement

select cast(repeat('1',20) as unsigned);

cast(repeat('1',20) as unsigned)

11111111111111111111

select cast(repeat('1',20) as signed);

cast(repeat('1',20) as signed)

-7335632962598440505

Warnings:

Warning	1105	Cast to signed converted positive out-of-range integer to it's negative complement

select cast('1.2' as decimal(3,2));

cast('1.2' as decimal(3,2))

1.20