diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:20:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:20:02 +0200 |
| commit | 607467bd63db2c6ca64610eb9f4e703711f4dfc6 (patch) | |
| tree | 207950367562dbb11f5e3d1789b05db44366f7c7 /sql/session_tracker.cc | |
| parent | 1a9c593db8046a48b47db045915c6cce7f11e9ec (diff) | |
| parent | 985f63cce1057d7b3fd6e86e65a2a2ee7d970073 (diff) | |
| download | mariadb-git-607467bd63db2c6ca64610eb9f4e703711f4dfc6.tar.gz | |
Merge branch '10.2' into 10.3mariadb-10.3.23
Diffstat (limited to 'sql/session_tracker.cc')
| -rw-r--r-- | sql/session_tracker.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/session_tracker.cc b/sql/session_tracker.cc index 1b21012f09e..65d600b9b5a 100644 --- a/sql/session_tracker.cc +++ b/sql/session_tracker.cc @@ -1226,7 +1226,7 @@ void Session_tracker::store(THD *thd, String *buf) if ((size= net_length_size(length)) != 1) { - if (buf->reserve(size - 1, EXTRA_ALLOC)) + if (buf->reserve(size - 1, 0)) { buf->length(start); // it is safer to have 0-length block in case of error return; @@ -1236,6 +1236,7 @@ void Session_tracker::store(THD *thd, String *buf) The 'buf->reserve()' can change the buf->ptr() so we cannot calculate the 'data' earlier. */ + buf->length(buf->length() + (size - 1)); data= (uchar *)(buf->ptr() + start); memmove(data + (size - 1), data, length); } |