bzr commit into mysql-5.1-bugteam branch (joro:2847) Bug#43884

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/fix-5.1-pe-stagee/ based on revid:joro@stripped

 2847 Georgi Kodinov	2009-03-27
      Worked around the problem described in bug #43884.

    modified:
      mysql-test/suite/rpl/r/rpl_loadfile.result
      mysql-test/suite/rpl/t/rpl_loadfile.test
=== modified file 'mysql-test/suite/rpl/r/rpl_loadfile.result'
--- a/mysql-test/suite/rpl/r/rpl_loadfile.result	2009-03-24 18:27:33 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loadfile.result	2009-03-27 10:59:31 +0000
@@ -233,7 +233,7 @@ include/start_slave.inc
 SELECT repeat('x',20) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_39701.data';
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (t text);
-CREATE PROCEDURE p(file TEXT) 
+CREATE PROCEDURE p(file varchar(4096)) 
 BEGIN
 INSERT INTO t1 VALUES (LOAD_FILE(file));
 END|

=== modified file 'mysql-test/suite/rpl/t/rpl_loadfile.test'
--- a/mysql-test/suite/rpl/t/rpl_loadfile.test	2009-03-24 18:27:33 +0000
+++ b/mysql-test/suite/rpl/t/rpl_loadfile.test	2009-03-27 10:59:31 +0000
@@ -73,7 +73,7 @@ enable_warnings;
 
 CREATE TABLE t1 (t text);
 DELIMITER |;
-CREATE PROCEDURE p(file TEXT) 
+CREATE PROCEDURE p(file varchar(4096)) 
   BEGIN
     INSERT INTO t1 VALUES (LOAD_FILE(file));
   END|


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