bzr push into mysql-trunk branch (Dmitry.Shulga:3901 to 3902) Bug#11753919

[Dmitry Shulga]

 3902 Dmitry Shulga	2012-02-14
      This is a prerequisite patch for bug#11753919 - fixed PB failures that
      were fired after a subquery optimization feature had been enabled.

    added:
      mysql-test/t/subquery_sj_all-master.opt
      mysql-test/t/subquery_sj_all_bka-master.opt
      mysql-test/t/subquery_sj_all_bka_nixbnl-master.opt
      mysql-test/t/subquery_sj_all_bkaunique-master.opt
      mysql-test/t/subquery_sj_dupsweed-master.opt
      mysql-test/t/subquery_sj_dupsweed_bka-master.opt
      mysql-test/t/subquery_sj_dupsweed_bka_nixbnl-master.opt
      mysql-test/t/subquery_sj_dupsweed_bkaunique-master.opt
      mysql-test/t/subquery_sj_firstmatch-master.opt
      mysql-test/t/subquery_sj_firstmatch_bka-master.opt
 3901 Tor Didriksen	2012-02-14
      Make result files json compliant.

    modified:
      mysql-test/suite/opt_trace/include/general.inc
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/include/subquery.inc
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_all.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_all.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
=== added file 'mysql-test/t/subquery_sj_all-master.opt'
--- a/mysql-test/t/subquery_sj_all-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/subquery_sj_all-master.opt	2012-02-14 17:23:39 +0000
@@ -0,0 +1 @@
+--thread-stack=524288

=== added file 'mysql-test/t/subquery_sj_all_bka-master.opt'
--- a/mysql-test/t/subquery_sj_all_bka-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/subquery_sj_all_bka-master.opt	2012-02-14 17:23:39 +0000
@@ -0,0 +1 @@
+--thread-stack=524288

=== added file 'mysql-test/t/subquery_sj_all_bka_nixbnl-master.opt'
--- a/mysql-test/t/subquery_sj_all_bka_nixbnl-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/subquery_sj_all_bka_nixbnl-master.opt	2012-02-14 17:23:39 +0000
@@ -0,0 +1 @@
+--thread-stack=524288

=== added file 'mysql-test/t/subquery_sj_all_bkaunique-master.opt'
--- a/mysql-test/t/subquery_sj_all_bkaunique-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/subquery_sj_all_bkaunique-master.opt	2012-02-14 17:23:39 +0000
@@ -0,0 +1 @@
+--thread-stack=524288

=== added file 'mysql-test/t/subquery_sj_dupsweed-master.opt'
--- a/mysql-test/t/subquery_sj_dupsweed-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/subquery_sj_dupsweed-master.opt	2012-02-14 17:23:39 +0000
@@ -0,0 +1 @@
+--thread-stack=524288

=== added file 'mysql-test/t/subquery_sj_dupsweed_bka-master.opt'
--- a/mysql-test/t/subquery_sj_dupsweed_bka-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/subquery_sj_dupsweed_bka-master.opt	2012-02-14 17:23:39 +0000
@@ -0,0 +1 @@
+--thread-stack=524288

=== added file 'mysql-test/t/subquery_sj_dupsweed_bka_nixbnl-master.opt'
--- a/mysql-test/t/subquery_sj_dupsweed_bka_nixbnl-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/subquery_sj_dupsweed_bka_nixbnl-master.opt	2012-02-14 17:23:39 +0000
@@ -0,0 +1 @@
+--thread-stack=524288

=== added file 'mysql-test/t/subquery_sj_dupsweed_bkaunique-master.opt'
--- a/mysql-test/t/subquery_sj_dupsweed_bkaunique-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/subquery_sj_dupsweed_bkaunique-master.opt	2012-02-14 17:23:39 +0000
@@ -0,0 +1 @@
+--thread-stack=524288

=== added file 'mysql-test/t/subquery_sj_firstmatch-master.opt'
--- a/mysql-test/t/subquery_sj_firstmatch-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/subquery_sj_firstmatch-master.opt	2012-02-14 17:23:39 +0000
@@ -0,0 +1 @@
+--thread-stack=524288

=== added file 'mysql-test/t/subquery_sj_firstmatch_bka-master.opt'
--- a/mysql-test/t/subquery_sj_firstmatch_bka-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/subquery_sj_firstmatch_bka-master.opt	2012-02-14 17:23:39 +0000
@@ -0,0 +1 @@
+--thread-stack=524288

No bundle (reason: useless for push emails).