bzr push into mysql-trunk branch (gleb.shchepa:3480 to 3489)

[Gleb Shchepa]

 3489 Gleb Shchepa	2011-11-12
      Intermediate commit, opt_explain_json.cc: ctx_t tree normalization

    modified:
      sql/opt_explain.cc
      sql/opt_explain_format.h
      sql/opt_explain_json.cc
      sql/opt_explain_json.h
 3488 Gleb Shchepa	2011-11-12
      - mv explain_json.test explain_json.inc
      * replace explain_json_all.result with explain_json.result

    removed:
      mysql-test/r/explain_json_all.result
    renamed:
      mysql-test/r/explain_json.result => mysql-test/r/explain_json_all.result
      mysql-test/t/explain_json.test => mysql-test/include/explain_json.inc
    modified:
      mysql-test/t/explain_json_all.test
      mysql-test/t/explain_json_none.test
      mysql-test/r/explain_json_all.result
 3487 Gleb Shchepa	2011-11-11
      * Opt_trace to generate JSON

    modified:
      mysql-test/include/explain_utils.inc
      mysql-test/r/explain_json.result
      mysql-test/r/explain_json_all.result
      mysql-test/r/explain_json_none.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      sql/opt_explain_format.h
      sql/opt_explain_json.cc
      sql/opt_explain_json.h
 3486 Gleb Shchepa	2011-11-10
      - cleanup st_select_lex_unit::explain_marker in cleanup() only

    modified:
      sql/sql_lex.cc
 3485 Gleb Shchepa	2011-11-10
      * s/"UNION"/"PRIMARY"/ for JSON output

    modified:
      mysql-test/r/explain_json.result
      mysql-test/r/explain_json_all.result
      mysql-test/r/explain_json_none.result
      sql/opt_explain.cc
      sql/opt_explain_format.h
      sql/opt_explain_json.cc
      sql/opt_explain_traditional.cc
      sql/sql_lex.h
 3484 Gleb Shchepa	2011-11-10
      + CTX_MATERIALIZE

    added:
      mysql-test/r/explain_json_all.result
      mysql-test/r/explain_json_none.result
      mysql-test/t/explain_json_all.test
      mysql-test/t/explain_json_none.test
    modified:
      mysql-test/r/explain_json.result
      mysql-test/t/explain_json.test
      sql/opt_explain.cc
      sql/opt_explain_format.h
      sql/opt_explain_json.cc
 3483 Gleb Shchepa	2011-11-10
      - is_hierarchical() method elimination
      + FORMAT=JSON is always EXTENDED+PARTITIONS

    modified:
      mysql-test/r/explain_json.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      sql/opt_explain.cc
      sql/opt_explain_format.h
      sql/opt_explain_json.h
      sql/opt_explain_traditional.h
      sql/sql_yacc.yy
 3482 Gleb Shchepa	2011-11-10
      + compound select_type for JSON

    modified:
      mysql-test/r/explain_json.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      sql/opt_explain.cc
      sql/opt_explain_format.h
      sql/opt_explain_json.cc
      sql/opt_explain_traditional.cc
      sql/opt_explain_traditional.h
      sql/sql_lex.cc
      sql/sql_lex.h
 3481 Gleb Shchepa	2011-11-10
      + UPDATE ... SET field=(subquery)
      + explain_utils.inc: EXPLAIN $query 

    modified:
      mysql-test/include/explain_utils.inc
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      sql/opt_explain.cc
      sql/opt_explain_format.h
      sql/opt_explain_json.cc
 3480 Gleb Shchepa	2011-11-09 [merge]
      WL #5855: Print EXPLAIN in JSON format
      
      Guilhem's fix: small fixes related to EXPLAIN JSON

    modified:
      mysql-test/include/explain_utils.inc
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/suite/opt_trace/validate_json.py

Diff too large for email (25505 lines, the limit is 10000).
No bundle (reason: useless for push emails).