Merge branch 'master' of github.com:Percona-Lab/sysbench-tpcc

Author: vadimtk

tpcc.lua

@@ -55,4 +55,9 @@ function event()
 
 end
 
+function sysbench.hooks.report_intermediate(stat)
+-- --   print("my stat: ", val)
+   sysbench.report_csv(stat)
+end
+
 -- vim:ts=4 ss=4 sw=4 expandtab

tpcc_check.lua

@@ -34,13 +34,12 @@ function check_tables(drv, con, warehouse_num)
             local d_tax = tonumber(row[2])
             if d_tax ~= 0 then
                 pass1=0
+                print(string.format("Check 1, warehouse: %d, table %d FAILED!!!", warehouse_num, table_num))
             end
         end
     end
 
-    if pass1 == 1 then
-        print(string.format("Check 1, warehouse: %d PASSED", warehouse_num))
-    else
+    if pass1 ~= 1 then
         print(string.format("Check 1, warehouse: %d FAILED!!!", warehouse_num))
     end
 

tpcc_common.lua

@@ -336,7 +336,12 @@ function set_isolation_level(drv,con)
             isolation_level="SERIALIZABLE"
         end
 
-        con:query("SET SESSION transaction_isolation='".. isolation_level .."'")
+        rs=con:query("SHOW VARIABLES LIKE 't%_isolation'")
+        row = rs:fetch_row()
+        isolation_variable = row[1]
+
+        con:query("SET SESSION " .. isolation_variable .. "='".. isolation_level .."'")
+--        con:query("SET SESSION transaction_isolation='".. isolation_level .."'")
 --        con:query("SET SESSION tx_isolation='".. isolation_level .."'")
    end
 end

tpcc_run.lua

@@ -160,9 +160,10 @@ function new_order()
 	  local i_data
 
 	  if rs.nrows == 0 then
-            con:query("ROLLBACK")
+        --print("ROLLBACK")
+        con:query("ROLLBACK")
 	    return	
-          end
+      end
 
 	  for i = 1, rs.nrows do
 	    row = rs:fetch_row()