diff options
| author | unknown <osku@127.(none)> | 2005-08-12 11:39:19 +0300 |
|---|---|---|
| committer | unknown <osku@127.(none)> | 2005-08-12 11:39:19 +0300 |
| commit | babc9f5d2bce17bfcbff2d4d1ab6b451059ab954 (patch) | |
| tree | 21b7de1b8632c1f1729e35528e580de73fb20e60 /innobase/include | |
| parent | 5329be868e6dc44bd78e5b5540b37ee8cb204513 (diff) | |
| download | mariadb-git-babc9f5d2bce17bfcbff2d4d1ab6b451059ab954.tar.gz | |
InnoDB: Print more than 300 characters of queries in various error conditions,
most notably deadlocked ones in SHOW INNODB STATUS. Fixes bug #7819.
innobase/btr/btr0pcur.c:
Adapt to changes in trx_print.
innobase/include/trx0trx.h:
Add max_query_len parameter to trx_print.
innobase/lock/lock0lock.c:
Adapt to changes in trx_print.
innobase/row/row0ins.c:
Adapt to changes in trx_print.
innobase/row/row0sel.c:
Adapt to changes in trx_print.
innobase/row/row0umod.c:
Adapt to changes in trx_print.
innobase/row/row0upd.c:
Adapt to changes in trx_print.
innobase/srv/srv0srv.c:
Adapt to changes in trx_print.
innobase/trx/trx0trx.c:
Add max_query_len parameter to trx_print.
sql/ha_innodb.cc:
Add max_query_len parameter to innobase_mysql_print_thd.
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/trx0trx.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index a3ef755348c..5dbf003594f 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -329,17 +329,20 @@ trx_commit_step( /*============*/ /* out: query thread to run next, or NULL */ que_thr_t* thr); /* in: query thread */ + /************************************************************************** -Prints info about a transaction to the standard output. The caller must -own the kernel mutex and must have called -innobase_mysql_prepare_print_arbitrary_thd(), unless he knows that MySQL or -InnoDB cannot meanwhile change the info printed here. */ +Prints info about a transaction to the given file. The caller must own the +kernel mutex and must have called +innobase_mysql_prepare_print_arbitrary_thd(), unless he knows that MySQL +or InnoDB cannot meanwhile change the info printed here. */ void trx_print( /*======*/ - FILE* f, /* in: output stream */ - trx_t* trx); /* in: transaction */ + FILE* f, /* in: output stream */ + trx_t* trx, /* in: transaction */ + uint max_query_len); /* in: max query length to print, or 0 to + use the default max length */ #ifndef UNIV_HOTBACKUP /************************************************************************** |