~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to conf/innodb_simple.cc

merge from internal tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
$combinations = [
2
2
        [
3
3
        '
 
4
                --grammar=conf/engine_stress.yy
 
5
                --gendata=conf/engine_stress.zz
4
6
                --engine=Innodb
5
7
                --reporters=Deadlock,ErrorLog,Backtrace,Recovery,Shutdown
6
8
                --mysqld=--loose-falcon-lock-wait-timeout=1
7
9
                --mysqld=--loose-innodb-lock-wait-timeout=1
8
10
                --mysqld=--log-output=none
9
11
                --mysqld=--skip-safemalloc
 
12
                --mem
 
13
                --duration=1200
10
14
        '], [
11
 
                '--mysqld=--innodb-thread-concurrency-timer-based=TRUE',
12
 
                '--mysqld=--innodb-thread-concurrency-timer-based=FALSE'
 
15
                '--mysqld=--loose-innodb-thread-concurrency-timer-based=TRUE',
 
16
                '--mysqld=--loose-innodb-thread-concurrency-timer-based=FALSE'
13
17
        ], [
14
18
                '--rows=10',
15
19
                '--rows=100',