diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2011-03-28 12:05:02 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2011-03-28 12:05:02 +0300 |
| commit | 88650f36f41238952a0f5139e1881aef7b642729 (patch) | |
| tree | 97946c7969ec1b6779c303538ea150eee7ecccaf /storage/innobase | |
| parent | 538e7d165524a72e10aa237897025cb02489d379 (diff) | |
| parent | 764871292ed6dcf86875ac20408c132bf2bba4cf (diff) | |
| download | mariadb-git-88650f36f41238952a0f5139e1881aef7b642729.tar.gz | |
Merge mysql-5.1-innodb -> mysql-5.5-innodb
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/trx/trx0i_s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0i_s.c b/storage/innobase/trx/trx0i_s.c index aff49e20726..c18b747da6d 100644 --- a/storage/innobase/trx/trx0i_s.c +++ b/storage/innobase/trx/trx0i_s.c @@ -518,7 +518,7 @@ fill_trx_row( query[stmt_len] = '\0'; row->trx_query = ha_storage_put_memlim( - cache->storage, stmt, stmt_len + 1, + cache->storage, query, stmt_len + 1, MAX_ALLOWED_FOR_STORAGE(cache)); row->trx_query_cs = innobase_get_charset(trx->mysql_thd); |