Commit 7edadde7 authored by Marko Mäkelä's avatar Marko Mäkelä

Remove bogus __attribute__((nonnull))

These were reported when running tests after compiling the debug server
with -O3 -fsanitize=undefined in GCC 7.1.0.
parent 9756440f
......@@ -2430,7 +2430,8 @@ fts_query_terms_in_document(
/*****************************************************************//**
Retrieve the document and match the phrase tokens.
@return DB_SUCCESS or error code */
static MY_ATTRIBUTE((nonnull, warn_unused_result))
MY_ATTRIBUTE((nonnull(1,2,3,6), warn_unused_result))
static
dberr_t
fts_query_match_document(
/*=====================*/
......
/*****************************************************************************
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
......@@ -62,7 +63,7 @@ cmp_data_data(
ulint len1,
const byte* data2,
ulint len2)
MY_ATTRIBUTE((nonnull, warn_unused_result));
MY_ATTRIBUTE((warn_unused_result));
/** Compare two data fields.
@param[in] dfield1 data field; must have type field set
......
......@@ -195,7 +195,7 @@ row_merge_drop_temp_indexes(void);
/** Create temporary merge files in the given paramater path, and if
UNIV_PFS_IO defined, register the file descriptor with Performance Schema.
@param[in] path location for creating temporary merge files.
@param[in] path location for creating temporary merge files, or NULL
@return File descriptor */
int
row_merge_file_create_low(
......@@ -398,13 +398,13 @@ row_merge_buf_empty(
/** Create a merge file in the given location.
@param[out] merge_file merge file structure
@param[in] path location for creating temporary file
@param[in] path location for creating temporary file, or NULL
@return file descriptor, or -1 on failure */
int
row_merge_file_create(
merge_file_t* merge_file,
const char* path)
MY_ATTRIBUTE((warn_unused_result, nonnull));
MY_ATTRIBUTE((warn_unused_result, nonnull(1)));
/** Merge disk files.
@param[in] trx transaction
......
......@@ -4030,7 +4030,7 @@ row_merge_drop_temp_indexes(void)
/** Create temporary merge files in the given paramater path, and if
UNIV_PFS_IO defined, register the file descriptor with Performance Schema.
@param[in] path location for creating temporary merge files.
@param[in] path location for creating temporary merge files, or NULL
@return File descriptor */
int
row_merge_file_create_low(
......@@ -4063,7 +4063,7 @@ row_merge_file_create_low(
/** Create a merge file in the given location.
@param[out] merge_file merge file structure
@param[in] path location for creating temporary file
@param[in] path location for creating temporary file, or NULL
@return file descriptor, or -1 on failure */
int
row_merge_file_create(
......@@ -4373,7 +4373,8 @@ row_merge_rename_tables_dict(
@param[in,out] index index
@param[in] add_v new virtual columns added along with add index call
@return DB_SUCCESS or error code */
static MY_ATTRIBUTE((nonnull, warn_unused_result))
MY_ATTRIBUTE((nonnull(1,2,3), warn_unused_result))
static
dberr_t
row_merge_create_index_graph(
trx_t* trx,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment