~drizzle-trunk/drizzle/development

Merge of Eric's libdrizzle work.

added added

removed removed

-- source include/innodb_trx_weight.inc

100

-- let $con1_extra_sql = INSERT INTO t4 VALUES (1), (1), (1)

101

-- let $con1_extra_sql_present = 1

102

-- let $con1_extra_sql2 = INSERT INTO t5_nontrans VALUES (1)

103

-- let $con1_extra_sql2_present = 1

102

104

-- let $con2_extra_sql = INSERT INTO t5_nontrans VALUES (1)

103

105

-- let $con2_extra_sql_present = 1

104

106

-- let $con1_should_be_rolledback = 0