diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-01 01:10:37 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-01 16:52:19 +0300 |
commit | 2b27ac8282ed81b1b0c65e748d66498b81b85cee (patch) | |
tree | 7c4b94e0507fe71392a045477fabdcfbcd80b802 /storage/innobase/rem | |
parent | 87b0434e0f6ddcf0801355eb08d39c4fd02dd4e9 (diff) | |
download | mariadb-git-2b27ac8282ed81b1b0c65e748d66498b81b85cee.tar.gz |
Fix many -Wunused-parameter
Remove unused InnoDB function parameters and functions.
i_s_sys_virtual_fill_table(): Do not allocate heap memory.
mtr_is_block_fix(): Replace with mtr_memo_contains().
mtr_is_page_fix(): Replace with mtr_memo_contains_page().
Diffstat (limited to 'storage/innobase/rem')
-rw-r--r-- | storage/innobase/rem/rem0cmp.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/storage/innobase/rem/rem0cmp.cc b/storage/innobase/rem/rem0cmp.cc index 410292c3790..34f71c86bbe 100644 --- a/storage/innobase/rem/rem0cmp.cc +++ b/storage/innobase/rem/rem0cmp.cc @@ -229,7 +229,6 @@ static int cmp_geometry_field( /*===============*/ - ulint mtype, /*!< in: main type */ ulint prtype, /*!< in: precise type */ const byte* a, /*!< in: data field */ unsigned int a_length, /*!< in: data field length, @@ -303,10 +302,8 @@ cmp_gis_field( not UNIV_SQL_NULL */ { if (mode == PAGE_CUR_MBR_EQUAL) { - /* TODO: Since the DATA_GEOMETRY is not used in compare - function, we could pass it instead of a specific type now */ - return(cmp_geometry_field(DATA_GEOMETRY, DATA_GIS_MBR, - a, a_length, b, b_length)); + return cmp_geometry_field(DATA_GIS_MBR, + a, a_length, b, b_length); } else { return rtree_key_cmp(mode, a, int(a_length), b, int(b_length)); } @@ -379,8 +376,7 @@ cmp_whole_field( return(innobase_mysql_cmp(prtype, a, a_length, b, b_length)); case DATA_GEOMETRY: - return(cmp_geometry_field(mtype, prtype, a, a_length, b, - b_length)); + return cmp_geometry_field(prtype, a, a_length, b, b_length); default: ib::fatal() << "Unknown data type number " << mtype; } |