fixes

Author: vadimtk

tpcc_check.lua

@@ -117,7 +117,7 @@ function check_tables(drv, con, warehouse_num)
     local pass8 = 1
     for table_num = 1, sysbench.opt.tables do 
         -- print(string.format("Checking  tables: %d for warehouse: %d\n", table_num, warehouse_num))
-        rs  = con:query(string.format("SELECT count(*) cn FROM (SELECT w_id,w_ytd,SUM(h_amount) sm FROM history%d,warehouse%d WHERE h_w_id=w_id GROUP BY w_id) t1 WHERE w_ytd<>sm",table_num, table_num))
+        rs  = con:query(string.format("SELECT count(*) cn FROM (SELECT w_id,w_ytd,SUM(h_amount) sm FROM history%d,warehouse%d WHERE h_w_id=w_id and w_id=%d GROUP BY w_id) t1 WHERE w_ytd<>sm",table_num, table_num, warehouse_num))
 
         for i = 1, rs.nrows do
             row = rs:fetch_row()
@@ -137,7 +137,7 @@ function check_tables(drv, con, warehouse_num)
     local pass9 = 1
     for table_num = 1, sysbench.opt.tables do 
         -- print(string.format("Checking  tables: %d for warehouse: %d\n", table_num, warehouse_num))
-        rs  = con:query(string.format("SELECT COUNT(*) FROM (select d_id,d_w_id,sum(d_ytd) s1 from district%d group by d_id,d_w_id) d,(select h_d_id,h_w_id,sum(h_amount) s2 from history%d group by h_d_id, h_w_id) h WHERE h_d_id=d_id AND d_w_id=h_w_id and s1<>s2",table_num, table_num))
+        rs  = con:query(string.format("SELECT COUNT(*) FROM (select d_id,d_w_id,sum(d_ytd) s1 from district%d group by d_id,d_w_id) d,(select h_d_id,h_w_id,sum(h_amount) s2 from history%d group by h_d_id, h_w_id) h WHERE h_d_id=d_id AND d_w_id=h_w_id and d_w_id=%d and s1<>s2",table_num, table_num, warehouse_num))
 
         for i = 1, rs.nrows do
             row = rs:fetch_row()

tpcc_common.lua

@@ -41,7 +41,9 @@ sysbench.cmdline.options = {
    use_fk =
       {"Use foreign keys", 1},
    mysql_storage_engine =
-      {"Storage engine, if MySQL is used", "innodb"}
+      {"Storage engine, if MySQL is used", "innodb"},
+   mysql_table_options =
+      {"Extra table options, if MySQL is used. e.g. 'COLLATE latin1_bin'", ""}
 }
 
 function sleep(n)
@@ -104,6 +106,7 @@ function create_tables(drv, con, table_num)
       drv:name() == "drizzle"
    then
       engine_def = "/*! ENGINE = " .. sysbench.opt.mysql_storage_engine .. " */"
+      extra_table_options = sysbench.opt.mysql_table_options or ""
    end
 
 
@@ -278,8 +281,8 @@ function create_tables(drv, con, table_num)
 	i_price decimal(5,2), 
 	i_data varchar(50),
 	PRIMARY KEY(i_id) 
-	) %s ]],
-      i, engine_def)
+	) %s %s]],
+      i, engine_def, extra_table_options)
 
    con:query(query)
 

tpcc_run.lua

@@ -638,7 +638,6 @@ function delivery()
 --		                SET ol_delivery_d = :datetime
 --		                WHERE ol_o_id = :no_o_id AND ol_d_id = :d_id AND
 --				ol_w_id = :w_id;*/
-        print("Update ol_delivery_d"..table_num.." no_o_id: "..no_o_id )
         con:query(string.format([[UPDATE order_line%d SET ol_delivery_d = NOW()
                 WHERE ol_o_id = %d AND ol_d_id = %d AND ol_w_id = %d]],
                       table_num, no_o_id, d_id, w_id))