Alexey Kopytov eca9c2cc71 Manual merge from 0.4.

2010-11-06 17:30:53 +03:00

..

drivers

Manual merge from 0.4.

2010-11-01 12:01:02 +03:00

scripting

Fixed an incorrect merge.

2010-11-01 12:37:19 +03:00

tests

Fixed compiler warnings.

2010-11-06 17:10:38 +03:00

CMakeLists.txt

Since Bazaar does not allow merging of two unrelated branches,

2009-05-28 19:25:12 +04:00

db_driver.c

Manual merge from 0.4.

2010-11-06 17:30:53 +03:00

db_driver.h

Fixed compiler warnings.

2010-11-06 17:10:38 +03:00

Makefile.am

Merge lp:~elambert/sysbench/trunk_drizzle_merge with some modifications.

2009-09-21 23:25:59 +04:00

sb_list.h

Merged all in drizzle sysbench changes with the exception of those changes

2009-06-10 16:43:32 -07:00

sb_logger.c

Manual merge from 0.4.

2010-11-01 12:01:02 +03:00

sb_logger.h

Rewrote intermediate statistics feature contributed by Mikael Ronstrom.

2010-11-01 11:35:41 +03:00

sb_options.c

Manual merge from 0.4.

2010-11-01 12:01:02 +03:00

sb_options.h

Manual merge from 0.4.

2010-11-01 12:01:02 +03:00

sb_timer.c

Manual merge from 0.4.

2010-11-06 17:30:53 +03:00

sb_timer.h

Manual merge from 0.4.

2010-11-01 12:01:02 +03:00

sb_win.c

Rewrote intermediate statistics feature contributed by Mikael Ronstrom.

2010-11-01 11:35:41 +03:00

sb_win.h

Manual merge from 0.4.

2010-11-01 12:01:02 +03:00

sysbench.c

Manual merge from 0.4.

2010-11-06 17:30:53 +03:00

sysbench.h

Manual merge from 0.4.

2010-11-01 12:01:02 +03:00