← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/trx0trx.h

Merge initial InnoDB+ import.

This was applied by generating a patch between MySQL 5.1.50 InnoDB plugin and
the just-merged innodb+ from mysql-trunk revision-id: vasil.dimov@oracle.com-20100422110752-1zowoqxel5xx3z2e

Then, some manual merge resolving and it worked. This should make it much
easier to merge the rest of InnoDB 1.1 and 1.2 from the mysql tree using
my bzr-reapply script.

This takes us to InnoDB 1.1.1(ish).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/trx0trx.h
391
391
trx_is_interrupted(
392
392
/*===============*/
393
393
        trx_t*  trx);   /*!< in: transaction */
394
 
/**********************************************************************//**
395
 
Determines if the currently running transaction is in strict mode.
396
 
@return TRUE if strict */
397
 
UNIV_INTERN
398
 
ibool
399
 
trx_is_strict(
400
 
/*==========*/
401
 
        trx_t*  trx);   /*!< in: transaction */
402
394
#else /* !UNIV_HOTBACKUP */
403
395
#define trx_is_interrupted(trx) FALSE
404
396
#endif /* !UNIV_HOTBACKUP */
560
552
        /*------------------------------*/
561
553
        void*           mysql_thd;      /*!< MySQL thread handle corresponding
562
554
                                        to this trx, or NULL */
 
555
        char**          mysql_query_str;/* pointer to the field in mysqld_thd
 
556
                                        which contains the pointer to the
 
557
                                        current SQL query string */
563
558
        const char*     mysql_log_file_name;
564
559
                                        /* if MySQL binlog is used, this field
565
560
                                        contains a pointer to the latest file