Merge mysql-5.1-innodb -> mysql-5.5-innodb

This commit is contained in:
Vasil Dimov 2011-03-28 12:05:02 +03:00
commit 88650f36f4

View File

@ -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);