List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:February 24 2012 12:59am
Subject:bzr push into mysql-trunk-wl5259 branch (chris.powers:3389 to 3390) WL#5259
View as plain text  
 3390 Christopher Powers	2012-02-23
      WL#5259 PERFORMANCE SCHEMA, host cache
      
      Fixed timestamp bug

    modified:
      storage/perfschema/pfs_engine_table.cc
 3389 Marc Alff	2012-02-22 [merge]
      Merge mysql-trunk --> mysql-trunk-wl5259

    added:
      mysql-test/r/mysql_client_test_embedded.result
      mysql-test/t/mysql_client_test_embedded.cnf
      mysql-test/t/mysql_client_test_embedded.test
    modified:
      client/sql_string.cc
      client/sql_string.h
      mysql-test/r/func_group.result
      mysql-test/r/func_set.result
      mysql-test/r/group_by.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/select_found.result
      mysql-test/r/subquery_mat_none.result
      mysql-test/suite/innodb/t/innodb_bug34300.test
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/t/disabled.def
      mysql-test/t/func_group.test
      mysql-test/t/func_set.test
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/log_event.cc
      sql/mysqld.cc
      sql/rpl_handler.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_executor.cc
      sql/sql_list.h
      sql/sql_load.cc
      sql/sql_optimizer.cc
      sql/sql_optimizer.h
      sql/sql_select.cc
      sql/sql_show.cc
      sql/sql_string.cc
      sql/sql_string.h
      sql/sys_vars.cc
      tests/mysql_client_test.c
      unittest/gunit/opt_range-t.cc
=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2012-01-26 10:20:10 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2012-02-24 00:57:57 +0000
@@ -510,8 +510,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-wl5259 branch (chris.powers:3389 to 3390) WL#5259Christopher Powers24 Feb