bzr push into mysql-trunk branch (tor.didriksen:3436 to 3437)

[Tor Didriksen]

 3437 Tor Didriksen	2011-09-26 [merge]
      merge 5.5 => trunk

    modified:
      mysql-test/r/func_str.result
      mysql-test/t/func_str.test
 3436 Bjorn Munch	2011-09-26 [merge]
      null upmerge

=== modified file 'mysql-test/r/func_str.result'
--- a/mysql-test/r/func_str.result	2011-09-22 10:42:10 +0000
+++ b/mysql-test/r/func_str.result	2011-09-26 12:27:06 +0000
@@ -2853,8 +2853,8 @@ SELECT ((rpad(1.0,2048,1)) = ('4(') ^ (0
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: '4('
 SELECT
-pow((rpad(1.0,2048,1)),(b'1111111111111111111111111111111111111111111'));
-ERROR 22003: DOUBLE value is out of range in 'pow(rpad(1.0,2048,1),0x07ffffffffff)'
+pow((rpad(10.0,2048,1)),(b'1111111111111111111111111111111111111111111'));
+ERROR 22003: DOUBLE value is out of range in 'pow(rpad(10.0,2048,1),0x07ffffffffff)'
 SELECT ((rpad(1.0,2048,1)) + (0) ^ ('../'));
 ((rpad(1.0,2048,1)) + (0) ^ ('../'))
 1.011111111111111

=== modified file 'mysql-test/t/func_str.test'
--- a/mysql-test/t/func_str.test	2011-09-22 10:42:10 +0000
+++ b/mysql-test/t/func_str.test	2011-09-26 12:27:06 +0000
@@ -1481,7 +1481,7 @@ SELECT ((rpad(1.0,2048,1)) = ('4(') ^ (0
 
 --error 1690
 SELECT
-pow((rpad(1.0,2048,1)),(b'1111111111111111111111111111111111111111111'));
+pow((rpad(10.0,2048,1)),(b'1111111111111111111111111111111111111111111'));
 SELECT ((rpad(1.0,2048,1)) + (0) ^ ('../'));
 SELECT stddev_samp(rpad(1.0,2048,1));
 SELECT ((127.1) not in ((rpad(1.0,2048,1)),(''),(-1.1)));

No bundle (reason: useless for push emails).