bzr commit into mysql-next-mr-bugfixing branch (guilhem.bichot:3256)

[Guilhem Bichot]

#At file:///home/mysql_src/bzrrepos_new/mysql-next-mr-opt-backporting-wl4800/ based on revid:guilhem.bichot@stripped

 3256 Guilhem Bichot	2011-01-18
      forgot to update tests' results

    modified:
      mysql-test/r/optimizer_trace2.result
      mysql-test/r/optimizer_trace_no_prot.result
=== modified file 'mysql-test/r/optimizer_trace2.result'
--- a/mysql-test/r/optimizer_trace2.result	2011-01-17 15:28:59 +0000
+++ b/mysql-test/r/optimizer_trace2.result	2011-01-18 08:57:55 +0000
@@ -209,6 +209,7 @@ WHERE t3.i IS NULL
 ;
 i	i	i
 2	NULL	NULL
+3	3	NULL
 select TRACE from information_schema.OPTIMIZER_TRACE;
 TRACE
 {

=== modified file 'mysql-test/r/optimizer_trace_no_prot.result'
--- a/mysql-test/r/optimizer_trace_no_prot.result	2011-01-17 20:41:34 +0000
+++ b/mysql-test/r/optimizer_trace_no_prot.result	2011-01-18 08:57:55 +0000
@@ -1169,7 +1169,7 @@ NULL	NULL
 select length(@trace);
 length(@trace)
 13024
-set optimizer_trace_max_mem_size=12500;
+set optimizer_trace_max_mem_size=12700;
 select length(@query)+length(@trace) > @@optimizer_trace_max_mem_size;
 length(@query)+length(@trace) > @@optimizer_trace_max_mem_size
 1
@@ -1177,7 +1177,7 @@ SELECT * FROM t5 WHERE 5 IN (SELECT 1 FR
 c
 select (@missing_bytes:=missing_bytes_beyond_max_mem_size) from information_schema.OPTIMIZER_TRACE;
 (@missing_bytes:=missing_bytes_beyond_max_mem_size)
-639
+439
 select (@query2:=QUERY)+NULL,(@trace2:=TRACE)+NULL from information_schema.OPTIMIZER_TRACE;
 (@query2:=QUERY)+NULL	(@trace2:=TRACE)+NULL
 NULL	NULL
@@ -1185,7 +1185,7 @@ select length(@trace2),
 (length(@trace2) + @missing_bytes) = length(@trace),
 @query2 = @query;
 length(@trace2)	(length(@trace2) + @missing_bytes) = length(@trace)	@query2 = @query
-12385	1	1
+12585	1	1
 select length(@query2) + length(@trace2)
 between (@@optimizer_trace_max_mem_size-100) and (@@optimizer_trace_max_mem_size+100);
 length(@query2) + length(@trace2)


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