diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-06 21:50:42 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-06 21:50:42 +0200 |
| commit | c4f3e64c23fe7f7fd18c0a79f87f9771df15fe9f (patch) | |
| tree | 19228b51e768f8f6137e765b3cadc4fa9aa67540 /storage/xtradb/rem/rem0rec.cc | |
| parent | 29c776cfd1e560846e394f39d79ae43ff7d70c61 (diff) | |
| parent | dc1c9e69d0fbb531a25cb7cf957c1477135eae70 (diff) | |
| download | mariadb-git-c4f3e64c23fe7f7fd18c0a79f87f9771df15fe9f.tar.gz | |
Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.30
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( /*===================================*/ |