Commit f2b0b245 authored by Vasil Dimov's avatar Vasil Dimov

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

parents 85dbe88d 08d598fb
...@@ -518,7 +518,7 @@ fill_trx_row( ...@@ -518,7 +518,7 @@ fill_trx_row(
query[stmt_len] = '\0'; query[stmt_len] = '\0';
row->trx_query = ha_storage_put_memlim( row->trx_query = ha_storage_put_memlim(
cache->storage, stmt, stmt_len + 1, cache->storage, query, stmt_len + 1,
MAX_ALLOWED_FOR_STORAGE(cache)); MAX_ALLOWED_FOR_STORAGE(cache));
row->trx_query_cs = innobase_get_charset(trx->mysql_thd); row->trx_query_cs = innobase_get_charset(trx->mysql_thd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment