diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-01-27 13:21:21 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-01-27 13:21:21 +0100 |
| commit | e08279e5502549ab8d8616db9f6bdb98f3f4aa28 (patch) | |
| tree | 8cdfab9e3a00b9e21c01e94207449cc0fe0fcf17 /sql/table.h | |
| parent | fb0ea2b2a1270c9d3587b1ae4b91641a1ea0454d (diff) | |
| parent | 1422d0b08a9ad84d3e3435c8e1190ba4a79baca3 (diff) | |
| download | mariadb-git-e08279e5502549ab8d8616db9f6bdb98f3f4aa28.tar.gz | |
Merge 5.1-security => 5.5-security
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index be14270e12b..9a85dd83b13 100644 --- a/sql/table.h +++ b/sql/table.h @@ -298,6 +298,7 @@ typedef struct st_filesort_info { IO_CACHE *io_cache; /* If sorted through filesort */ uchar **sort_keys; /* Buffer for sorting keys */ + size_t sort_keys_size; /* Number of bytes allocated */ uchar *buffpek; /* Buffer for buffpek structures */ uint buffpek_len; /* Max number of buffpeks in the buffer */ uchar *addon_buf; /* Pointer to a buffer if sorted with fields */ |