Commit c9068232 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

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

into  trift2.:/MySQL/M50/push-5.0
parents a231b057 5e541e98

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")

mysql-test/r/sp-vars.result

+41 −0
Original line number Diff line number Diff line
@@ -1161,3 +1161,44 @@ CALL p1(); 
v_text

abc|def

DROP PROCEDURE p1;

DROP PROCEDURE IF EXISTS bug27415_text_test|

DROP PROCEDURE IF EXISTS bug27415_text_test2|

CREATE PROCEDURE bug27415_text_test(entity_id_str_in text)

BEGIN

DECLARE str_remainder text;

SET str_remainder = entity_id_str_in;

select 'before substr', str_remainder;

SET str_remainder = SUBSTRING(str_remainder, 3);

select 'after substr', str_remainder;

END|

CREATE PROCEDURE bug27415_text_test2(entity_id_str_in text)

BEGIN

DECLARE str_remainder text;

DECLARE str_remainder2 text;

SET str_remainder2 = entity_id_str_in;

select 'before substr', str_remainder2;

SET str_remainder = SUBSTRING(str_remainder2, 3);

select 'after substr', str_remainder;

END|

CALL bug27415_text_test('a,b,c')|

before substr	str_remainder

before substr	a,b,c

after substr	str_remainder

after substr	b,c

CALL bug27415_text_test('a,b,c')|

before substr	str_remainder

before substr	a,b,c

after substr	str_remainder

after substr	b,c

CALL bug27415_text_test2('a,b,c')|

before substr	str_remainder2

before substr	a,b,c

after substr	str_remainder

after substr	b,c

CALL bug27415_text_test('a,b,c')|

before substr	str_remainder

before substr	a,b,c

after substr	str_remainder

after substr	b,c

DROP PROCEDURE bug27415_text_test|

DROP PROCEDURE bug27415_text_test2|

mysql-test/t/sp-vars.test

+44 −0
Original line number Diff line number Diff line
@@ -1367,4 +1367,48 @@ CALL p1(); 


DROP PROCEDURE p1;



#

# Bug #27415 Text Variables in stored procedures

# If the SP varible was also referenced on the right side

# the result was corrupted.

#

DELIMITER |;



--disable_warnings

DROP PROCEDURE IF EXISTS bug27415_text_test|

DROP PROCEDURE IF EXISTS bug27415_text_test2|

--enable_warnings



CREATE PROCEDURE bug27415_text_test(entity_id_str_in text)

BEGIN

    DECLARE str_remainder text;



    SET str_remainder = entity_id_str_in;



    select 'before substr', str_remainder;

    SET str_remainder = SUBSTRING(str_remainder, 3);

    select 'after substr', str_remainder;

END|



CREATE PROCEDURE bug27415_text_test2(entity_id_str_in text)

BEGIN

    DECLARE str_remainder text;

    DECLARE str_remainder2 text;

 

    SET str_remainder2 = entity_id_str_in;

    select 'before substr', str_remainder2;

    SET str_remainder = SUBSTRING(str_remainder2, 3);

    select 'after substr', str_remainder;

END|



CALL bug27415_text_test('a,b,c')|

CALL bug27415_text_test('a,b,c')|

CALL bug27415_text_test2('a,b,c')|

CALL bug27415_text_test('a,b,c')|



DROP PROCEDURE bug27415_text_test|

DROP PROCEDURE bug27415_text_test2|



DELIMITER ;|



# End of 5.0 tests.