diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-05 00:59:57 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-05 00:59:57 +0200 |
| commit | 83da1a1e572d67588b66724b34fdb7f07963e80f (patch) | |
| tree | 54af19c1da875cdaa71c3c94a42fd6dfc53e97ad /storage/xtradb/rem/rem0rec.cc | |
| parent | f4806772d3578fee7fd03dd96f91d59b0269830e (diff) | |
| parent | 8d69ce7b821a88b5ba8749a08489839050283a63 (diff) | |
| download | mariadb-git-83da1a1e572d67588b66724b34fdb7f07963e80f.tar.gz | |
Merge branch 'merge-xtradb-5.6' into 10.0
Diffstat (limited to 'storage/xtradb/rem/rem0rec.cc')
| -rw-r--r-- | storage/xtradb/rem/rem0rec.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/rem/rem0rec.cc b/storage/xtradb/rem/rem0rec.cc index 6db11be18e9..c6d9ba935e1 100644 --- a/storage/xtradb/rem/rem0rec.cc +++ b/storage/xtradb/rem/rem0rec.cc @@ -786,7 +786,7 @@ rec_get_nth_field_offs_old( /**********************************************************//** Determines the size of a data tuple prefix in ROW_FORMAT=COMPACT. @return total size */ -UNIV_INLINE MY_ATTRIBUTE((warn_unused_result, nonnull(1,2))) +UNIV_INLINE MY_ATTRIBUTE((warn_unused_result)) ulint rec_get_converted_size_comp_prefix_low( /*===================================*/ |