diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-01-13 15:01:27 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-01-13 15:01:27 +0200 |
| commit | 730584247efbf67d01a619497d1057424104d700 (patch) | |
| tree | 5153520f19967f9ca1ba5da417550b5336e3d21b /sql | |
| parent | ca8498e89d21baa5717fcf9f0bb5ad93a9b6bbf8 (diff) | |
| parent | eaebef2ab64b65a275c6ddeb5864326d2e3b0571 (diff) | |
| download | mariadb-git-730584247efbf67d01a619497d1057424104d700.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index baeb16997b6..e7fbe1c521a 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -3938,18 +3938,21 @@ innodb_show_status( DBUG_RETURN(-1); } - /* We let the InnoDB Monitor to output at most 100 kB of text, add + /* We let the InnoDB Monitor to output at most 200 kB of text, add a safety margin of 10 kB for buffer overruns */ - buf = (char*)ut_malloc(110 * 1024); + buf = (char*)ut_malloc(210 * 1024); - srv_sprintf_innodb_monitor(buf, 100 * 1024); + srv_sprintf_innodb_monitor(buf, 200 * 1024); List<Item> field_list; field_list.push_back(new Item_empty_string("Status", strlen(buf))); if(send_fields(thd, field_list, 1)) { + + ut_free(buf); + DBUG_RETURN(-1); } |