From: Jorgen Loland
Date: November 4 2010 12:36pm
Subject: bzr commit into mysql-5.5-bugteam branch (jorgen.loland:3120) Bug#57882
List-Archive: http://lists.mysql.com/commits/122830
X-Bug: 57882
Message-Id: <20101104123643.13F2E18DF@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3469281577227218278=="

--===============3469281577227218278==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/jl208045/mysql/mysql-5.5-bugteam/ based on revid:sunanda.menon@stripped

 3120 Jorgen Loland	2010-11-04
      Bug#57882 - Item_func_conv_charset::val_str(String*): 
                  Assertion `fixed == 1' failed
      
      Followup patch. Test case relied on system variable that is
      only available if replication is compiled in. Replaced with
      variable available in all builds.
     @ mysql-test/r/errors.result
        Test case relied on system variable that is only available if
        replication is compiled in. Replaced with variable available in
        all builds.
     @ mysql-test/t/errors.test
        Test case relied on system variable that is only available if
        replication is compiled in. Replaced with variable available in
        all builds.

    modified:
      mysql-test/r/errors.result
      mysql-test/t/errors.test
=== modified file 'mysql-test/r/errors.result'
--- a/mysql-test/r/errors.result	2010-11-04 08:36:04 +0000
+++ b/mysql-test/r/errors.result	2010-11-04 12:36:36 +0000
@@ -141,7 +141,7 @@ DROP TABLE t1;
 SELECT (CONVERT('0' USING latin1) IN (CHAR(COT('v') USING utf8),''));
 ERROR 22003: DOUBLE value is out of range in 'cot('v')'
 SET NAMES utf8 COLLATE utf8_latvian_ci ;
-SELECT UPDATEXML(-73 * -2465717823867977728,@@global.slave_net_timeout,null);
+SELECT UPDATEXML(-73 * -2465717823867977728,@@global.auto_increment_increment,null);
 ERROR 22003: BIGINT value is out of range in '(-(73) * -(2465717823867977728))'
 #
 # End Bug#57882

=== modified file 'mysql-test/t/errors.test'
--- a/mysql-test/t/errors.test	2010-11-04 08:36:04 +0000
+++ b/mysql-test/t/errors.test	2010-11-04 12:36:36 +0000
@@ -166,7 +166,7 @@ SELECT (CONVERT('0' USING latin1) IN (CH
 
 SET NAMES utf8 COLLATE utf8_latvian_ci ;
 --error ER_DATA_OUT_OF_RANGE
-SELECT UPDATEXML(-73 * -2465717823867977728,@@global.slave_net_timeout,null);
+SELECT UPDATEXML(-73 * -2465717823867977728,@@global.auto_increment_increment,null);
 
 --echo #
 --echo # End Bug#57882


--===============3469281577227218278==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jorgen.loland@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@stripped\
#   42p62opd0p13x7y7
# target_branch: file:///export/home/jl208045/mysql/mysql-5.5-bugteam/
# testament_sha1: 0bce88a9f3c0672973a0ce4ca9b0d968298ea39c
# timestamp: 2010-11-04 13:36:43 +0100
# base_revision_id: sunanda.menon@stripped\
#   d1bwo73vwdrcpwt3
# 
# Begin bundle
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
HRxFjXZl/4u5IpwoSBP7fwcA


--===============3469281577227218278==--