File sysbench-0.4.8.dif of Package sysbench

--- sysbench/drivers/mysql/drv_mysql.c
+++ sysbench/drivers/mysql/drv_mysql.c
@@ -56,9 +56,9 @@
   {"mysql-host", "MySQL server host", SB_ARG_TYPE_LIST, "localhost"},
   {"mysql-port", "MySQL server port", SB_ARG_TYPE_INT, "3306"},
   {"mysql-socket", "MySQL socket", SB_ARG_TYPE_STRING, NULL},
-  {"mysql-user", "MySQL user", SB_ARG_TYPE_STRING, "sbtest"},
+  {"mysql-user", "MySQL user", SB_ARG_TYPE_STRING, "mysql"},
   {"mysql-password", "MySQL password", SB_ARG_TYPE_STRING, ""},
-  {"mysql-db", "MySQL database name", SB_ARG_TYPE_STRING, "sbtest"},
+  {"mysql-db", "MySQL database name", SB_ARG_TYPE_STRING, "test"},
   {"mysql-table-engine", "storage engine to use for the test table {myisam,innodb,bdb,heap,ndbcluster,federated}",
    SB_ARG_TYPE_STRING, "innodb"},
   {"mysql-engine-trx", "whether storage engine used is transactional or not {yes,no,auto}",
--- sysbench/sb_timer.c
+++ sysbench/sb_timer.c
@@ -175,6 +175,7 @@
 sb_timer_t merge_timers(sb_timer_t *t1, sb_timer_t *t2)
 {
   sb_timer_t t;
+  sb_timer_init(&t);
 
   t.my_time = t1->my_time+t2->my_time;
   t.sum_time = t1->sum_time+t2->sum_time;