diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-01 16:45:55 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-01 16:45:55 -0600 |
| commit | 971050de2635c5b63b33e658ad1a96a910abf856 (patch) | |
| tree | 2a8d736e8d3941988bfef30894f35d4dbadf0ae8 /storage/innobase | |
| parent | be4cfe504e081b79fbfd1870e1bca94795d20633 (diff) | |
| download | mariadb-git-971050de2635c5b63b33e658ad1a96a910abf856.tar.gz | |
Remove some redundant or unused code from InnoDB (feedback from
Marko after applying latest snapshot).
storage/innobase/handler/ha_innodb.cc:
Remove redundant assignment to thd_to_trx(thd); trx is
declared as a reference to thd_to_trx(thd) at the top
of the function, so this assignment isn't useful.
storage/innobase/include/trx0trx.h:
Remove two unused members from struct trx_struct. allow_duplicates
and replace_duplicates are not used; a single duplicates member is
used instead to represent both flags.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/include/trx0trx.h | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index ca566f1300e..52cd09c351e 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -947,8 +947,6 @@ check_trx_exists( /* Update the info whether we should skip XA steps that eat CPU time */ trx->support_xa = THDVAR(thd, support_xa); - - thd_to_trx(thd) = trx; } else { if (trx->magic_n != TRX_MAGIC_N) { mem_analyze_corruption(trx); diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index eeda2a7a52c..2459e76c4c1 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -512,14 +512,6 @@ struct trx_struct{ ulint mysql_process_no;/* since in Linux, 'top' reports process id's and not thread id's, we store the process number too */ - ibool allow_duplicates;/* normally FALSE, but if the user - wants to update duplicate rows, - (in table inserts, for example) we - set this TRUE */ - ibool replace_duplicates;/* normally FALSE, but if the user - wants to replace duplicate rows, - (in table inserts, for example) we - set this TRUE */ /*------------------------------*/ ulint n_mysql_tables_in_use; /* number of Innobase tables used in the processing of the current |