~drizzle-trunk/drizzle/development

Viewing changes to plugin/innobase/handler/ha_innodb.cc

Committer: Monty Taylor
Date: 2010-06-20 22:20:14 UTC
mfrom: (1626.1.4 build)
Revision ID: mordred@inaugust.com-20100620222014-9ae0uzuyo5lrhrld

Merge of Patrick's schema_dictionary test changes, Stewart's HA Status
variable move and more module program_options work.

Show diffs side-by-side

added added

removed removed

plugin/innobase/handler/ha_innodb.cc

3793

ut_error;

3794

}

3795

3796

ha_statistic_increment(&system_status_var::ha_write_count);

3797

3798

3796

sql_command = session_sql_command(user_session);

3799

3797

3800

3798

if ((sql_command == SQLCOM_ALTER_TABLE

4161

4159

4162

4160

ut_a(prebuilt->trx == trx);

4163

4161

4164

ha_statistic_increment(&system_status_var::ha_update_count);

4165

4166

4162

if (prebuilt->upd_node) {

4167

4163

uvect = prebuilt->upd_node->update;

4168

4164

} else {

4297

4293

4298

4294

ut_a(prebuilt->trx == trx);

4299

4295

4300

ha_statistic_increment(&system_status_var::ha_delete_count);

4301

4302

4296

if (!prebuilt->upd_node) {

4303

4297

row_get_prebuilt_update_vector(prebuilt);

4304

4298

}

Older »