diff options
| author | unknown <serg@serg.mylan> | 2005-03-16 12:45:08 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-16 12:45:08 +0100 |
| commit | 608b63c763689a239fcb26f8c82d64af676d0bda (patch) | |
| tree | 018be561cc5279f89381f8e8f6f9befe9ca83d1b /innobase | |
| parent | 929b30094d7c2c6080687f8b19448a51dba192e9 (diff) | |
| download | mariadb-git-608b63c763689a239fcb26f8c82d64af676d0bda.tar.gz | |
sql/ha_innodb.cc
protect prepare-...-commit with a mutex to ensure that commits in binlog and in the innodb have the same order
store binlog position with the commit
innobase/include/trx0trx.h:
comment modified
sql/ha_innodb.cc:
protect prepare-...-commit with a mutex to ensure that commits in binlog and in the innodb have the same order
store binlog position with the commit
sql/handler.cc:
ha_prepare cannot return -1
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/trx0trx.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index 9db69261468..64e9c87fbbd 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -390,8 +390,9 @@ struct trx_struct{ dulint table_id; /* table id if the preceding field is TRUE */ /*------------------------------*/ - int active_trans; /* whether a transaction in MySQL - is active */ + int active_trans; /* 1 - if a transaction in MySQL + is active. 2 - if prepare_commit_mutex + was taken */ void* mysql_thd; /* MySQL thread handle corresponding to this trx, or NULL */ char** mysql_query_str;/* pointer to the field in mysqld_thd |