diff options
Diffstat (limited to 'storage/xtradb/row/row0merge.cc')
| -rw-r--r-- | storage/xtradb/row/row0merge.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/xtradb/row/row0merge.cc b/storage/xtradb/row/row0merge.cc index b803a0d76c4..f46da173eaa 100644 --- a/storage/xtradb/row/row0merge.cc +++ b/storage/xtradb/row/row0merge.cc @@ -4189,9 +4189,10 @@ wait_again: (total_static_cost + total_dynamic_cost) * PCT_COST_MERGESORT_INDEX * 100; - bufend = innobase_convert_name(buf, sizeof buf, + bufend = innobase_convert_name( + buf, sizeof buf, indexes[i]->name, strlen(indexes[i]->name), - trx ? trx->mysql_thd : NULL, + trx->mysql_thd, FALSE); buf[bufend - buf]='\0'; |