1. 02 Aug, 2006 1 commit
    • unknown's avatar
      Merge trift2.:/M50/back241-5.0 · 95dcd768
      unknown authored
      into  trift2.:/M51/merge-5.0-to-5.1
      
      
      support-files/mysql.spec.sh:
        Null-merge, as 5.1 uses a different approach to testing.
      95dcd768
  2. 01 Aug, 2006 15 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 30e11b06
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      
      mysql-test/r/innodb.result:
        Auto merged
      30e11b06
    • unknown's avatar
      sql_view.cc: · 84b16f0e
      unknown authored
        After merge fix
      
      
      sql/sql_view.cc:
        After merge fix
      84b16f0e
    • unknown's avatar
      Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql · 8ce7848a
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      sql/sql_view.cc:
        SCCS merged
      8ce7848a
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 10b90c06
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      
      10b90c06
    • unknown's avatar
      Makefile.am: · b3708b7c
      unknown authored
        After merge fix
      
      
      storage/ndb/test/ndbapi/Makefile.am:
        After merge fix
      b3708b7c
    • unknown's avatar
      func_str.result: · a03006eb
      unknown authored
        After merge fix
      
      
      mysql-test/r/func_str.result:
        After merge fix
      a03006eb
    • unknown's avatar
      serg's MacOSX-intel portability diff · e80a76d7
      unknown authored
      e80a76d7
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 759027d1
      unknown authored
      into  rakia.(none):/home/kgeorge/mysql/autopush/B20103-5.0-opt
      
      
      759027d1
    • unknown's avatar
      Bug #20103: Escaping with backslash does not work · ec95bf78
      unknown authored
       - make the client to respect the server-side 
         no_backslash_escapes option and disable the 
         special meaning of backslash also at client side.
      
      
      mysql-test/r/mysql_client.result:
        Bug #20103: Escaping with backslash does not work
         - test case
      mysql-test/t/mysql_client.test:
        Bug #20103: Escaping with backslash does not work
         - test case
      ec95bf78
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · deee3a30
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      
      mysql-test/r/auto_increment.result:
        Auto merged
      mysql-test/r/binlog_row_blackhole.result:
        Auto merged
      mysql-test/r/binlog_stm_blackhole.result:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/func_compress.result:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/r/func_math.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/func_system.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/r/group_min_max.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/r/partition_pruning.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/rpl_get_lock.result:
        Auto merged
      mysql-test/r/rpl_master_pos_wait.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/group_min_max.test:
        Auto merged
      mysql-test/t/partition_pruning.test:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.h:
        Auto merged
      deee3a30
    • unknown's avatar
      After merge fix · f75e79e0
      unknown authored
      f75e79e0
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 0c0f49bc
      unknown authored
      into  rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
      
      
      0c0f49bc
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b91f3bac
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
      
      
      b91f3bac
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · 9cb377f9
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
      
      
      extra/yassl/src/ssl.cpp:
        Auto merged
      mysql-test/t/rpl_openssl.test:
        Auto merged
      9cb377f9
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · f3099ba3
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      f3099ba3
  3. 31 Jul, 2006 10 commits
    • unknown's avatar
      Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql · 749091a9
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      
      mysql-test/r/func_group.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/select.result:
        SCCS merged
      749091a9
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 0a6f3aad
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
      
      
      extra/yassl/src/ssl.cpp:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      0a6f3aad
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 03206fd7
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      extra/yassl/src/ssl.cpp:
        Auto merged
      03206fd7
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 76f65b3f
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
      
      
      76f65b3f
    • unknown's avatar
      select.result, func_group.result, sql_select.cc: · 45871dbf
      unknown authored
        After merge fix
      
      
      mysql-test/r/select.result:
        After merge fix
      mysql-test/r/func_group.result:
        After merge fix
      sql/sql_select.cc:
        After merge fix
      45871dbf
    • unknown's avatar
      BUG#14940: Post-merge fixes: update test results · 9f90d4c2
      unknown authored
      9f90d4c2
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 464cb603
      unknown authored
      into  rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      464cb603
    • unknown's avatar
      Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE · b74cb623
      unknown authored
       
      made DROP VIEW to continue on error and report an aggregated error 
       at its end. This makes it similar to DROP TABLE.
      
      
      mysql-test/r/view.result:
        Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
         - test case
         - changed error message
      mysql-test/t/view.test:
        Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
         - test case
      sql/sql_view.cc:
        Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
         - made DROP VIEW to continue on error and report an aggregated error
      b74cb623
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-opt · 4acf6de8
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/B21080-5.0-opt
      
      
      mysql-test/r/view.result:
        merge
      mysql-test/t/view.test:
        merge
      4acf6de8
    • unknown's avatar
      Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM · c8673b09
      unknown authored
        When executing ALTER TABLE all the attributes of the view were overwritten.
        This is contrary to the user's expectations.
        So some of the view attributes are preserved now : namely security and 
        algorithm. This means that if they are not specified in ALTER VIEW
        their values are preserved from CREATE VIEW instead of being defaulted.
      
      
      mysql-test/r/view.result:
        Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
         - test suite
      mysql-test/t/view.test:
        Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
         - test suite
      sql/sql_lex.h:
        Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
         - must make create_view_suid a tristate : on/off/unspecified
      sql/sql_view.cc:
        Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
         - open the view to get it's attributes and put then as defaults 
           for ALTER VIEW
      sql/sql_yacc.yy:
        Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
         - must make create_view_suid a tristate : on/off/unspecified
      sql/table.h:
        Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
         - must make create_view_suid a tristate : on/off/unspecified
      c8673b09
  4. 30 Jul, 2006 2 commits
  5. 29 Jul, 2006 8 commits
    • unknown's avatar
      Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql · ddb91478
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/group_min_max.result:
        Auto merged
      BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
        Auto merged
      BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
        Auto merged
      BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
        Auto merged
      BitKeeper/deleted/.del-mysqldump.dsp~a8bd23547d3fc27e:
        Auto merged
      BitKeeper/deleted/.del-mysqldump_ia64.dsp~a2aabe898be35b31:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/type_ranges.result:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      mysql-test/t/func_group.test:
        Auto merged
      mysql-test/t/group_min_max.test:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/innodb_mysql.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/time.cc:
        Auto merged
      storage/ndb/test/ndbapi/Makefile.am:
        Auto merged
      strings/decimal.c:
        Auto merged
      mysql-test/r/analyse.result:
        Manual merge
      mysql-test/r/bigint.result:
        Manual merge
      mysql-test/r/create.result:
        Manual merge
      mysql-test/r/information_schema.result:
        Manual merge
      mysql-test/r/ps_2myisam.result:
        Manual merge
      mysql-test/r/ps_3innodb.result:
        Manual merge
      mysql-test/r/ps_4heap.result:
        Manual merge
      mysql-test/r/ps_5merge.result:
        Manual merge
      mysql-test/r/ps_6bdb.result:
        Manual merge
      mysql-test/r/rpl_insert_id.result:
        Manual merge
      mysql-test/r/select.result:
        Manual merge
      mysql-test/r/sp.result:
        Manual merge
      mysql-test/r/subselect.result:
        Manual merge
      mysql-test/t/information_schema.test:
        Manual merge
      mysql-test/t/rpl_insert_id.test:
        Manual merge
      sql/field.h:
        Manual merge
      sql/item.cc:
        Manual merge
      sql/item.h:
        Manual merge
      sql/item_strfunc.h:
        Manual merge
      sql/item_sum.cc:
        Manual merge
      sql/mysql_priv.h:
        Manual merge
      sql/share/errmsg.txt:
        Manual merge
      sql/sql_class.h:
        Manual merge
      sql/sql_select.cc:
        Manual merge
      ddb91478
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 283e41d6
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.1-bug14940-r4
      
      
      mysql-test/r/partition_pruning.result:
        Auto merged
      mysql-test/t/partition_pruning.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      283e41d6
    • unknown's avatar
      BUG#14940: post-review fixes · 3e2af0b8
      unknown authored
      
      sql/opt_range.cc:
        BUG#14940: post-review fixes:
         - fix comments
         - use set_if_smaller
      3e2af0b8
    • unknown's avatar
      Merge sunlight.local:/local_work/tmp_merge-4.1-opt-mysql · 08be4e96
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
      
      
      mysql-test/t/select.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/func_group.result:
        Manual merge
      mysql-test/r/select.result:
        Manual merge
      mysql-test/r/subselect.result:
        Manual merge
      08be4e96
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 · fc466665
      unknown authored
      into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      
      mysql-test/r/partition_pruning.result:
        Auto merged
      mysql-test/t/partition_pruning.test:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      fc466665
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · ba718a45
      unknown authored
      into  sunlight.local:/home/evgen/bk-trees/mysql-5.1-opt
      
      
      sql/sql_select.cc:
        Auto merged
      ba718a45
    • unknown's avatar
      Make innodb_flush_log_at_trx_commit a settable global variable. · 7d43d6fd
      unknown authored
      
      sql/ha_innodb.cc:
        Remove innobase_flush_log_at_trx_commit
        (set srv_flush_log_at_trx_commit directly).
      sql/ha_innodb.h:
        Remove innobase_flush_log_at_trx_commit.
        Declare srv_flush_log_at_trx_commit.
      sql/mysqld.cc:
        Bypass the innobase_flush_log_at_trx_commit variable.
      storage/innobase/include/srv0srv.h:
        Change the type of srv_flush_log_at_trx_commit.
      storage/innobase/srv/srv0srv.c:
        Change the type of srv_flush_log_at_trx_commit.
      7d43d6fd
    • unknown's avatar
      Fix tests after merge and disable rpl_ndb_dd_advance due to bug 18679. · b230225b
      unknown authored
      
      mysql-test/r/date_formats.result:
        Fix results after merge
      mysql-test/r/mysqldump.result:
        Fix results after merge
      mysql-test/t/disabled.def:
        Add randomly-failing test with open bug
      mysql-test/t/mysqldump.test:
        Clean up test after merge and fix 'End of test' markers
      b230225b
  6. 28 Jul, 2006 4 commits
    • unknown's avatar
      Make innodb_thread_concurrency 0 by default, and extend · 605871f5
      unknown authored
       the usable range to 0..1000 (0 disables the thread throttling).
      
      
      sql/mysqld.cc:
        innodb_thread_concurrency is 0..1000 now, and
         0 (the default) disables the thread throttling.
      605871f5
    • unknown's avatar
      Merge rama.(none):/home/jimw/my/tmp_merge · d10db4cf
      unknown authored
      into  rama.(none):/home/jimw/my/mysql-5.1-clean
      
      
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      configure.in:
        Auto merged
      extra/yassl/include/openssl/ssl.h:
        Auto merged
      extra/yassl/include/yassl_int.hpp:
        Auto merged
      extra/yassl/src/ssl.cpp:
        Auto merged
      extra/yassl/src/template_instnt.cpp:
        Auto merged
      extra/yassl/src/yassl_imp.cpp:
        Auto merged
      extra/yassl/src/yassl_int.cpp:
        Auto merged
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/embedded_priv.h:
        Auto merged
      BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      libmysqld/libmysqld.c:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/mysqldump-max.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_string.h:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      sql/time.cc:
        Auto merged
      storage/myisam/mi_create.c:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      BitKeeper/deleted/.del-have_case_sensitive_file_system.inc:
        Delete: mysql-test/include/have_case_sensitive_file_system.inc
      BitKeeper/deleted/.del-case_sensitive_file_system.require:
        Delete: mysql-test/r/case_sensitive_file_system.require
      mysql-test/lib/mtr_cases.pl:
        Resolve conflict
      mysql-test/mysql-test-run.pl:
        Resolve conflict
      mysql-test/r/mysqldump.result:
        Resolve conflict
      mysql-test/t/mysqldump.test:
        Resolve conflict
      sql/sql_parse.cc:
        Resolve conflict
      d10db4cf
    • unknown's avatar
      BUG#14940 "MySQL choose wrong index", v.2 · ef452e19
      unknown authored
      - Make the range-et-al optimizer produce E(#table records after table 
                                                 condition is applied),
      - Make the join optimizer use this value,
      - Add "filtered" column to EXPLAIN EXTENDED to show 
        fraction of records left after table condition is applied
      - Adjust test results, add comments
      
      
      mysql-test/r/archive_gis.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/auto_increment.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/bdb_gis.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/bench_count_distinct.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/binlog_stm_blackhole.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/case.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/cast.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/compress.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/ctype_collate.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/ctype_cp1250_ch.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/date_formats.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/distinct.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/fulltext.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_compress.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_crypt.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_default.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_encrypt.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_gconcat.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_group.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_if.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_in.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_like.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_math.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_op.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_regexp.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_set.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_str.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_system.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_test.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/func_time.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/gis.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/group_by.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/group_min_max.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/having.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/heap.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/heap_hash.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/index_merge.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/index_merge_innodb.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/index_merge_ror.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/innodb_gis.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/insert_update.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/join.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/join_nested.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/key_diff.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/myisam.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/ndb_gis.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/negation_elimination.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/null.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/olap.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/partition_pruning.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/query_cache.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/row.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/rpl_get_lock.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/rpl_master_pos_wait.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/select.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/ssl.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/ssl_compress.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/subselect.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/type_blob.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/union.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/varbinary.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/variables.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/r/view.result:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/t/ctype_cp1250_ch.test:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/t/func_like.test:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/t/group_min_max.test:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/t/index_merge_ror.test:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/t/index_merge_ror_cpk.test:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/t/join.test:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      mysql-test/t/partition_pruning.test:
        BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      sql/opt_range.cc:
        BUG#14940: Make range/index_merge/group-min-max optimizer produce TABLE::quick_condition_rows -
          estimate of #records that will match the table condition.
      sql/sql_class.cc:
        BUG#14940: Add "filtered" column to output of EXPLAIN EXTENDED
      sql/sql_select.cc:
        BUG#14940: 
        - Make the join optimizer to use TABLE::quick_condition_rows=
          = E(#table records after filtering with table condition) 
        - Add "filtered" column to output of EXPLAIN EXTENDED
      sql/sql_select.h:
        BUG#14940: Added comments
      sql/table.h:
        BUG#14940: Added comments
      ef452e19
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · a13b3c49
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      mysql-test/r/create_not_windows.result:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      a13b3c49