bzr commit into mysql-6.0-bugteam branch (bar:3191) Bug#24690

[Alexander Barkov]

#At file:///home/bar/mysql-bzr/mysql-6.0-bugteam/ based on revid:joro@stripped

 3191 Alexander Barkov	2009-04-08
      Post-fix for bug#24690 "Stored functions: RETURNing UTF8 strings do not return UTF8_UNICODE_CI collation"
      
      There was a mistake in the test file (wrong delimiter)
      which made "mysql-test-run --ps" fails. 
      Fixing the delimiter.
      
      modified:
        mysql-test/r/sp-ucs2.result
        mysql-test/t/sp-ucs2.test

    modified:
      mysql-test/r/sp-ucs2.result
      mysql-test/t/sp-ucs2.test
=== modified file 'mysql-test/r/sp-ucs2.result'
--- a/mysql-test/r/sp-ucs2.result	2009-04-06 12:56:41 +0000
+++ b/mysql-test/r/sp-ucs2.result	2009-04-08 10:34:06 +0000
@@ -96,10 +96,10 @@ SET f1='str';
 CALL p1(f1, f2);
 RETURN f2;
 END|
-SELECT f1();
-DROP PROCEDURE p1|
+SELECT f1()|
 f1()
 ucs2_czech_ci ucs2_polish_ci
+DROP PROCEDURE p1|
 DROP FUNCTION f1|
 CREATE FUNCTION f(f1 VARCHAR(64) COLLATE ucs2_unicode_ci)
 RETURNS VARCHAR(64) CHARACTER SET ucs2

=== modified file 'mysql-test/t/sp-ucs2.test'
--- a/mysql-test/t/sp-ucs2.test	2009-04-06 12:56:41 +0000
+++ b/mysql-test/t/sp-ucs2.test	2009-04-08 10:34:06 +0000
@@ -106,7 +106,7 @@ BEGIN
 END|
 
 
-SELECT f1();
+SELECT f1()|
 DROP PROCEDURE p1|
 DROP FUNCTION f1|
 


Attachment: [text/bzr-bundle] bzr/[e-mail]