From edf3929cd589d150adccefc754a979ce7e5d7e36 Mon Sep 17 00:00:00 2001 From: "heikki@hundin.mysql.fi" <> Date: Fri, 9 Aug 2002 15:34:23 +0300 Subject: [PATCH] ha_innobase.cc, trx0trx.h, lock0lock.c, trx0trx.c: Add some more safety margin to buffer sizes in prints --- innobase/include/trx0trx.h | 2 +- innobase/lock/lock0lock.c | 4 ++-- innobase/trx/trx0trx.c | 2 +- sql/ha_innobase.cc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index 6e98f22c34b..84d85fcaff6 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -262,7 +262,7 @@ void trx_print( /*======*/ char* buf, /* in/out: buffer where to print, must be at least - 500 bytes */ + 800 bytes */ trx_t* trx); /* in: transaction */ diff --git a/innobase/lock/lock0lock.c b/innobase/lock/lock0lock.c index 2f5ade656d9..9b3719867f0 100644 --- a/innobase/lock/lock0lock.c +++ b/innobase/lock/lock0lock.c @@ -3625,7 +3625,7 @@ lock_print_info( trx = UT_LIST_GET_FIRST(trx_sys->mysql_trx_list); while (trx) { - if (buf_end - buf < 600) { + if (buf_end - buf < 900) { return; } @@ -3662,7 +3662,7 @@ loop: return; } - if (buf_end - buf < 600) { + if (buf_end - buf < 900) { return; } diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index 48b1ecc59f2..94a11042de5 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -1465,7 +1465,7 @@ void trx_print( /*======*/ char* buf, /* in/out: buffer where to print, must be at least - 500 bytes */ + 800 bytes */ trx_t* trx) /* in: transaction */ { char* start_of_line; diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index 251e6c3ca7e..5e6d4b5f50c 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -260,7 +260,7 @@ void innobase_mysql_print_thd( /*=====================*/ char* buf, /* in/out: buffer where to print, must be at least - 300 bytes */ + 400 bytes */ void* input_thd)/* in: pointer to a MySQL THD object */ { THD* thd; @@ -338,7 +338,7 @@ innobase_mysql_print_thd( buf=strnmov(buf, thd->query, 150); } *buf='\n'; - /* Here we should add '\0' to the nd of output to mark its end */ + /* Here we should add '\0' to the end of output to mark its end */ #endif } }