3448 Christopher Powers 2012-02-23
WL#5767 PERFORMANCE_SCHEMA statement digests
Fixed timestamp bug pfs_engine_table
modified:
storage/perfschema/pfs_engine_table.cc
3447 Marc Alff 2012-02-24 [merge]
Merge mysql-trunk --> mysql-trunk-wl5767
added:
mysql-test/include/greedy_search_drop_tables.inc
mysql-test/include/greedy_search_load_tables.inc
mysql-test/include/print_greedy_search_count.inc
mysql-test/r/greedy_search.result
mysql-test/t/greedy_search.test
sql/merge_sort.h
unittest/gunit/join_tab_sort-t.cc
modified:
mysql-test/include/select.inc
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/func_str.result
mysql-test/r/func_time.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/join_nested.result
mysql-test/r/join_nested_bka.result
mysql-test/r/join_nested_bka_nixbnl.result
mysql-test/r/metadata.result
mysql-test/r/mysql_client_test_embedded.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/select_all.result
mysql-test/r/select_all_bka.result
mysql-test/r/select_all_bka_nixbnl.result
mysql-test/r/select_icp_mrr.result
mysql-test/r/select_icp_mrr_bka.result
mysql-test/r/select_icp_mrr_bka_nixbnl.result
mysql-test/r/select_none.result
mysql-test/r/select_none_bka.result
mysql-test/r/select_none_bka_nixbnl.result
mysql-test/r/subquery_all.result
mysql-test/r/subquery_all_bka.result
mysql-test/r/subquery_mat_all.result
mysql-test/r/subquery_sj_dupsweed.result
mysql-test/r/subquery_sj_dupsweed_bka.result
mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
mysql-test/r/subquery_sj_dupsweed_bkaunique.result
mysql-test/r/subquery_sj_firstmatch.result
mysql-test/r/subquery_sj_firstmatch_bka.result
mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
mysql-test/r/subquery_sj_firstmatch_bkaunique.result
mysql-test/r/subquery_sj_loosescan.result
mysql-test/r/subquery_sj_loosescan_bka.result
mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
mysql-test/r/subquery_sj_loosescan_bkaunique.result
mysql-test/r/type_temporal_fractional.result
mysql-test/r/type_timestamp.result
mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
mysql-test/suite/opt_trace/r/bugs_ps_prot_all.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/t/partition_alter4_myisam.test
mysql-test/suite/rpl/t/rpl_row_event_max_size.test
mysql-test/t/disabled.def
mysql-test/t/func_str.test
mysql-test/t/mysql_client_test_embedded.test
mysql-test/t/type_timestamp.test
sql/field.cc
sql/item.cc
sql/item_func.cc
sql/item_strfunc.cc
sql/item_timefunc.cc
sql/item_timefunc.h
sql/mysqld.cc
sql/sql_class.h
sql/sql_const.h
sql/sql_executor.cc
sql/sql_planner.cc
sql/sql_planner.h
sql/sql_select.h
unittest/gunit/CMakeLists.txt
=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc 2012-02-23 23:27:02 +0000
+++ b/storage/perfschema/pfs_engine_table.cc 2012-02-24 01:25:29 +0000
@@ -511,8 +511,8 @@ void PFS_engine_table::set_field_enum(Fi
void PFS_engine_table::set_field_timestamp(Field *f, ulonglong value)
{
struct timeval tm;
- tm.tv_sec= (long) value / 1000000;
- tm.tv_usec= (long) value % 1000000;
+ tm.tv_sec= (long)(value / 1000000);
+ tm.tv_usec= (long)(value % 1000000);
DBUG_ASSERT(f->real_type() == MYSQL_TYPE_TIMESTAMP2);
Field_timestampf *f2= (Field_timestampf*) f;
f2->store_timestamp(& tm);
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl5767 branch (chris.powers:3447 to 3448) WL#5767 | Christopher Powers | 24 Feb |
