~drizzle-trunk/drizzle/development

Committer: lbieber
Date: 2010-08-29 05:45:49 UTC
mfrom: (1734.2.1 staging)
Revision ID: lbieber@orisndriz03-20100829054549-9ruuvwr16egf1hq2

Merge Lee - fix bug 624974 - second pass on changing error numbers to enum values
Merge Shrews - fix bug 600795 - LOAD DATA INFILE INSERT not registered by the transaction log

files modified:
drizzled/cursor.cc

drizzled/message/transaction_reader.cc

drizzled/transaction_services.cc

drizzled/transaction_services.h

plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment.test

plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_statement_rollback.test

plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_prefix.test

plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rename.test

plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/replace.test

Show diffs side-by-side

added added

removed removed

drizzled/cursor.cc

1363

break;

1364

case SQLCOM_INSERT:

1365

case SQLCOM_INSERT_SELECT:

1366

case SQLCOM_LOAD:

1366

1367

1368

* The else block below represents an

1368

1369

* INSERT ... ON DUPLICATE KEY UPDATE that

Older »