List:Commits« Previous MessageNext Message »
From:Alexander Barkov Date:November 17 2011 1:54pm
Subject:bzr push into mysql-trunk branch (alexander.barkov:3596 to 3597) WL#946
WL#5885
View as plain text  
 3597 Alexander Barkov	2011-11-17 [merge]
      Merging WL#946 and WL#5885

    added:
      mysql-test/r/temporal_literal.result
      mysql-test/r/type_temporal_fractional.result
      mysql-test/suite/rpl/r/rpl_temporal_fractional.result
      mysql-test/suite/rpl/t/rpl_temporal_fractional.test
      mysql-test/t/temporal_literal.test
      mysql-test/t/type_temporal_fractional.test
      unittest/gunit/field-t.cc
    modified:
      client/mysqlbinlog.cc
      client/mysqltest.cc
      include/decimal.h
      include/my_global.h
      include/my_time.h
      include/mysql.h.pp
      include/mysql_com.h
      include/mysql_time.h
      libmysql/libmysql.c
      mysql-test/r/cast.result
      mysql-test/r/create.result
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/date_formats.result
      mysql-test/r/deprecated_features.result
      mysql-test/r/func_in_icp.result
      mysql-test/r/func_in_icp_mrr.result
      mysql-test/r/func_in_mrr.result
      mysql-test/r/func_in_mrr_cost.result
      mysql-test/r/func_in_none.result
      mysql-test/r/func_math.result
      mysql-test/r/func_sapdb.result
      mysql-test/r/func_time.result
      mysql-test/r/func_timestamp.result
      mysql-test/r/information_schema.result
      mysql-test/r/join_cache_bka.result
      mysql-test/r/join_cache_bka_nixbnl.result
      mysql-test/r/join_cache_bkaunique.result
      mysql-test/r/join_cache_bnl.result
      mysql-test/r/join_cache_nojb.result
      mysql-test/r/loaddata.result
      mysql-test/r/metadata.result
      mysql-test/r/mysqlbinlog_row.result
      mysql-test/r/mysqlbinlog_row_innodb.result
      mysql-test/r/mysqlbinlog_row_myisam.result
      mysql-test/r/parser.result
      mysql-test/r/partition_datatype.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/partition_myisam.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/ps_1general.result
      mysql-test/r/ps_2myisam.result
      mysql-test/r/ps_3innodb.result
      mysql-test/r/ps_4heap.result
      mysql-test/r/ps_5merge.result
      mysql-test/r/show_check.result
      mysql-test/r/sp-vars.result
      mysql-test/r/sp.result
      mysql-test/r/strict.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_nomat_nosj_bka.result
      mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result
      mysql-test/r/subquery_none.result
      mysql-test/r/subquery_none_bka.result
      mysql-test/r/subquery_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      mysql-test/r/sysdate_is_now.result
      mysql-test/r/type_date.result
      mysql-test/r/type_datetime.result
      mysql-test/r/type_time.result
      mysql-test/r/type_timestamp.result
      mysql-test/r/type_year.result
      mysql-test/suite/funcs_1/r/innodb_func_view.result
      mysql-test/suite/funcs_1/r/is_columns.result
      mysql-test/suite/funcs_1/r/is_columns_is.result
      mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
      mysql-test/suite/funcs_1/r/memory_func_view.result
      mysql-test/suite/funcs_1/r/myisam_func_view.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/funcs_1/views/func_view.inc
      mysql-test/suite/innodb/r/innodb_bug52745.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      mysql-test/suite/parts/r/partition_datetime_innodb.result
      mysql-test/suite/parts/r/partition_datetime_myisam.result
      mysql-test/suite/rpl/r/rpl_rewrt_db.result
      mysql-test/suite/sys_vars/r/timestamp_basic.result
      mysql-test/suite/sys_vars/t/timestamp_basic.test
      mysql-test/t/cast.test
      mysql-test/t/deprecated_features.test
      mysql-test/t/func_math.test
      mysql-test/t/func_time.test
      mysql-test/t/information_schema.test
      mysql-test/t/metadata.test
      mysql-test/t/mysqlbinlog_row.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/partition_myisam.test
      mysql-test/t/strict.test
      mysql-test/t/type_date.test
      mysql-test/t/type_datetime.test
      mysql-test/t/type_time.test
      mysql-test/t/type_year.test
      mysys/my_getsystime.c
      sql-common/my_time.c
      sql/event_data_objects.cc
      sql/event_db_repository.cc
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/filesort.cc
      sql/ha_ndbcluster.cc
      sql/ha_partition.cc
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_create.cc
      sql/item_create.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_row.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/item_sum.cc
      sql/item_sum.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log.cc
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/mysqld.cc
      sql/opt_range.cc
      sql/procedure.h
      sql/protocol.cc
      sql/protocol.h
      sql/rpl_rli_pdb.cc
      sql/rpl_slave.cc
      sql/rpl_utility.cc
      sql/rpl_utility.h
      sql/sp.cc
      sql/sp_head.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_const.h
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_insert.cc
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_show.cc
      sql/sql_string.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_time.cc
      sql/sql_time.h
      sql/sql_update.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/sys_vars.h
      sql/table.cc
      sql/table.h
      sql/tztime.h
      storage/archive/ha_archive.cc
      storage/csv/ha_tina.cc
      storage/example/ha_example.cc
      storage/federated/ha_federated.cc
      storage/heap/ha_heap.cc
      storage/innobase/dict/dict0stats.c
      storage/innobase/handler/ha_innodb.cc
      storage/myisam/ha_myisam.cc
      storage/myisammrg/ha_myisammrg.cc
      strings/decimal.c
      tests/mysql_client_test.c
      unittest/gunit/CMakeLists.txt
      unittest/gunit/item-t.cc
 3596 Mayank Prasad	2011-11-14
      WL#5885 : 
      
      Details:
      	Fixed result files for failing embedded tests.

    modified:
      mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
      mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result

Diff too large for email (54239 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (alexander.barkov:3596 to 3597) WL#946WL#5885Alexander Barkov18 Nov