Commit 11feedf0 authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
parents c50adc26 d5685d4c

CMakeLists.txt

+5 −0
Original line number Diff line number Diff line
@@ -154,6 +154,11 @@ IF(EMBED_MANIFESTS) 
    # Disable automatic manifest generation.

    STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 

    	   ${CMAKE_EXE_LINKER_FLAGS})

    # Explicitly disable it since it is the default for newer versions of VS

    STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})

    IF(NOT tmp_manifest)

        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")

    ENDIF(tmp_manifest)

    # Set the processor architecture.

    IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")

    	SET(PROCESSOR_ARCH "X64")

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.42)

AM_INIT_AUTOMAKE(mysql, 5.0.44)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=42

NDB_VERSION_BUILD=44

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

include/decimal.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ int decimal_bin_size(int precision, int scale); 
int decimal_result_size(decimal_t *from1, decimal_t *from2, char op,

                        int param);



int decimal_intg(decimal_t *from);

int decimal_add(decimal_t *from1, decimal_t *from2, decimal_t *to);

int decimal_sub(decimal_t *from1, decimal_t *from2, decimal_t *to);

int decimal_cmp(decimal_t *from1, decimal_t *from2);

mysql-test/r/bigint.result

+10 −0
Original line number Diff line number Diff line
@@ -352,3 +352,13 @@ select c1 mod 50 as result from t1; 
result

6

drop table t1;

select cast(19999999999999999999 as signed);

cast(19999999999999999999 as signed)

9223372036854775807

Warnings:

Error	1292	Truncated incorrect DECIMAL value: ''

select cast(-19999999999999999999 as signed);

cast(-19999999999999999999 as signed)

-9223372036854775808

Warnings:

Error	1292	Truncated incorrect DECIMAL value: ''

mysql-test/r/cast.result

+5 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ Warnings: 
Warning	1292	Truncated incorrect DOUBLE value: 'a'

select 10.0+cast('a' as decimal);

10.0+cast('a' as decimal)

10.00

10.0

Warnings:

Warning	1292	Truncated incorrect DECIMAL value: 'a'

select 10E+0+'a';
@@ -378,7 +378,9 @@ create table t1(s1 time); 
insert into t1 values ('11:11:11');

select cast(s1 as decimal(7,2)) from t1;

cast(s1 as decimal(7,2))

111111.00

99999.99

Warnings:

Error	1264	Out of range value adjusted for column 'cast(s1 as decimal(7,2))' at row 1

drop table t1;

CREATE TABLE t1 (v varchar(10), tt tinytext, t text,

mt mediumtext, lt longtext);
@@ -386,7 +388,7 @@ INSERT INTO t1 VALUES ('1.01', '2.02', '3.03', '4.04', '5.05'); 
SELECT CAST(v AS DECIMAL), CAST(tt AS DECIMAL), CAST(t AS DECIMAL),

CAST(mt AS DECIMAL), CAST(lt AS DECIMAL) from t1;

CAST(v AS DECIMAL)	CAST(tt AS DECIMAL)	CAST(t AS DECIMAL)	CAST(mt AS DECIMAL)	CAST(lt AS DECIMAL)

1.01	2.02	3.03	4.04	5.05

1	2	3	4	5

DROP TABLE t1;

select cast(NULL as decimal(6)) as t1;

t1