diff options
| author | heikki@hundin.mysql.fi <> | 2002-08-11 18:49:47 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2002-08-11 18:49:47 +0300 |
| commit | bee3f072e40dbdd40b45de1988309fb4bb9f6546 (patch) | |
| tree | d3f55dcc192a55ccc266a48e322be71aae0673af /innobase/lock | |
| parent | 0005f28b4ec6fdc73c83ea430f53f74103b26239 (diff) | |
| download | mariadb-git-bee3f072e40dbdd40b45de1988309fb4bb9f6546.tar.gz | |
ha_innobase.cc, ut0ut.c, univ.i, ut0ut.h:
Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
lock0lock.c:
Add safety against buffer overruns in latest deadlock info
srv0srv.c:
Add safety against buffer overruns in SHOW INNODB STATUS
os0thread.h, os0thread.c:
Fix a portability bug introduced in Windows when we changed os_thread_id_t to be the same as os_thread_t
Diffstat (limited to 'innobase/lock')
| -rw-r--r-- | innobase/lock/lock0lock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/lock/lock0lock.c b/innobase/lock/lock0lock.c index 9b3719867f0..da4092b926e 100644 --- a/innobase/lock/lock0lock.c +++ b/innobase/lock/lock0lock.c @@ -2754,6 +2754,8 @@ lock_deadlock_occurs( err_buf += sprintf(err_buf, "*** WE ROLL BACK TRANSACTION (2)\n"); + ut_a(strlen(lock_latest_err_buf) < 4100); + /* sess_raise_error_low(trx, DB_DEADLOCK, lock->type_mode, table, index, NULL, NULL, NULL); |