1. 01 Aug, 2006 3 commits
    • 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
      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
  2. 31 Jul, 2006 3 commits
  3. 30 Jul, 2006 1 commit
  4. 29 Jul, 2006 7 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
      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
  5. 28 Jul, 2006 4 commits
    • 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
    • unknown's avatar
      Add sql_locale.cc to cmake scripts. · 8ed51c92
      unknown authored
      8ed51c92
  6. 27 Jul, 2006 8 commits
  7. 26 Jul, 2006 14 commits
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/tmp_merge · 5b6016c1
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
        Auto merged
      BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
        Auto merged
      BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
        Auto merged
      BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      mysql-test/t/init_connect.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      mysql-test/r/federated.result:
        Use local.
      mysql-test/r/myisam.result:
        Manual merge.
      mysql-test/t/federated.test:
        Manual merge.
      mysql-test/t/myisam.test:
        Manual merge.
      sql/Makefile.am:
        Manual merge.
      sql/set_var.cc:
        Manual merge.
      sql/sql_parse.cc:
        Manual merge.
      sql/sql_update.cc:
        Manual merge.
      storage/myisam/mi_create.c:
        Manual merge.
      5b6016c1
    • unknown's avatar
      Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my51 · a9f0f116
      unknown authored
      into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935
      
      
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        manual
      a9f0f116
    • unknown's avatar
      ndb - bug#14935 - post-review · 743c4d99
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        bug#14935 - post-review
      storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
        bug#14935 - post-review
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        bug#14935 - post-review
      743c4d99
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · a920f554
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      sql/sql_table.cc:
        Auto merged
      a920f554
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f15c5686
      unknown authored
      into  moonbone.local:/work/19862-bug-5.0-opt-mysql
      
      
      f15c5686
    • unknown's avatar
      item_func.h, item_func.cc, sql_select.cc, item.h: · 1150869c
      unknown authored
        Post review changes for bug#19862.
      
      
      sql/sql_select.cc:
        Post review changes for bug#19862.
      sql/item_func.h:
        Post review changes for bug#19862.
      sql/item_func.cc:
        Post review changes for bug#19862.
      sql/item.h:
        Post review changes for bug#19862.
      1150869c
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · bb81f6ac
      unknown authored
      into  rakia.(none):/home/kgeorge/mysql/autopush/B20792-4.1-opt
      
      
      sql/sql_select.cc:
        Auto merged
      bb81f6ac
    • unknown's avatar
      Merge macbook.gmz:/Users/kgeorge/mysql/work/B20792-4.1-opt · c7c8c33c
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/B20792-5.0-opt
      
      
      mysql-test/r/subselect2.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      c7c8c33c
    • unknown's avatar
      * Bug #20792: Incorrect results from aggregate subquery · 6b75e24b
      unknown authored
      When processing aggregate functions all tables values are reset
      to NULLs at the end of each group. 
      When doing that if there are no rows found for a group
      the const tables must not be reset as they are not recalculated 
      by do_select()/sub_select() for each group.
      
      
      mysql-test/r/subselect2.result:
        * Bug #20792: Incorrect results from aggregate subquery
         - test suite for the bug. This is dependent on InnoDB despite
           the fact that the bug and the fix are not InnoDB specific.
           This is because of the table flag HA_NOT_EXACT_COUNT.
           When this flag is off (as in MyISAM) both t2 and t3 become of
           join type 'system' as they are estimated to have 1 record and
           and this statistics can be trusted (according to the absence of
           HA_NOT_EXACT_COUNT).
      mysql-test/t/subselect2.test:
        * Bug #20792: Incorrect results from aggregate subquery
         - test suite for the bug
      sql/sql_select.cc:
        * Bug #20792: Incorrect results from aggregate subquery
         - when clearing results if there are not rows found for group
           the const tables must not be reset as they are not recalculated
           for each group.
      6b75e24b
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · 70d27b35
      unknown authored
      into  rakia.(none):/home/kgeorge/mysql/autopush/B21019-4.1-opt
      
      
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/select.result:
        SCCS merged
      mysql-test/t/select.test:
        SCCS merged
      70d27b35
    • unknown's avatar
      8c92143b
    • unknown's avatar
      Merge macbook.gmz:/Users/kgeorge/mysql/work/B21019-4.1-opt · 048fbb84
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/B21019-5.0-opt
      
      
      mysql-test/t/select.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/select.result:
        SCCS merged
      048fbb84
    • unknown's avatar
      Add support for valgrind with callgrind · 1585d76e
      unknown authored
      1585d76e
    • unknown's avatar
      Merge 192.168.0.20:mysql/my51-m-bug21039 · 98e8c0bf
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      98e8c0bf