Commit 85c21dbc authored by Jan Lindström's avatar Jan Lindström

MDEV-6925: Remove bad "" operators.

Merged Facebook commit ec1aac68c74f3c1e558d057c4c9fcfe6edbbea93
authored by Steaphan Greene from https://github.com/facebook/mysql-5.6

In C++11, "" is not parsed as before.  So "A""B" is not the same as "AB".
Instead, whitespace is required, like: "A" "B"
parent caeffc7a
...@@ -1639,7 +1639,7 @@ trx_i_s_create_lock_id( ...@@ -1639,7 +1639,7 @@ trx_i_s_create_lock_id(
} else { } else {
/* table lock */ /* table lock */
res_len = ut_snprintf(lock_id, lock_id_size, res_len = ut_snprintf(lock_id, lock_id_size,
TRX_ID_FMT":" UINT64PF, TRX_ID_FMT ":" UINT64PF,
row->lock_trx_id, row->lock_trx_id,
row->lock_table_id); row->lock_table_id);
} }
......
...@@ -1653,7 +1653,7 @@ trx_i_s_create_lock_id( ...@@ -1653,7 +1653,7 @@ trx_i_s_create_lock_id(
} else { } else {
/* table lock */ /* table lock */
res_len = ut_snprintf(lock_id, lock_id_size, res_len = ut_snprintf(lock_id, lock_id_size,
TRX_ID_FMT":" UINT64PF, TRX_ID_FMT ":" UINT64PF,
row->lock_trx_id, row->lock_trx_id,
row->lock_table_id); row->lock_table_id);
} }
......
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