← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/tests/r/innodb_trx.result

  • Committer: Vijay Samuel
  • Date: 2010-08-20 02:23:54 UTC
  • mfrom: (1720.1.4 build)
  • mto: (1726.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1727.
  • Revision ID: vijay@vijay-20100820022354-sxunltk8q3nb8ld2
Merge removed the drizzled/option.h include from client_priv.h and archive_reader.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/tests/r/innodb_trx.result
3
3
TRX_ID  TRX_STATE       TRX_STARTED     TRX_REQUESTED_LOCK_ID   TRX_WAIT_STARTED        TRX_WEIGHT      TRX_DRIZZLE_THREAD_ID   TRX_QUERY
4
4
show create table INNODB_TRX;
5
5
Table   Create Table
6
 
INNODB_TRX      CREATE TABLE `innodb_trx` (
 
6
INNODB_TRX      CREATE TABLE `INNODB_TRX` (
7
7
  `TRX_ID` varchar(256) NOT NULL,
8
8
  `TRX_STATE` varchar(256) NOT NULL,
9
9
  `TRX_STARTED` bigint NOT NULL,
12
12
  `TRX_WEIGHT` bigint NOT NULL,
13
13
  `TRX_DRIZZLE_THREAD_ID` bigint NOT NULL,
14
14
  `TRX_QUERY` varchar(256) NOT NULL
15
 
) ENGINE=FunctionEngine
 
15
) ENGINE=FunctionEngine COLLATE = utf8_general_ci