diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-28 22:01:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-28 22:01:55 +0200 |
| commit | 3361aee591b1eb8c676f60887ffc535cd509890a (patch) | |
| tree | 54a65f83ba7d9293e6f8e8281ad920fbae6eb823 /storage/innobase/pars/pars0pars.cc | |
| parent | 6ce20fb2b9fe57330c797694b9dbea4028f40d7c (diff) | |
| parent | 0fdb17e6c3f50ae22eb97b6363bcbd8b0cd9e040 (diff) | |
| download | mariadb-git-3361aee591b1eb8c676f60887ffc535cd509890a.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'storage/innobase/pars/pars0pars.cc')
| -rw-r--r-- | storage/innobase/pars/pars0pars.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc index da08939d78a..e6af3d25e86 100644 --- a/storage/innobase/pars/pars0pars.cc +++ b/storage/innobase/pars/pars0pars.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. 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 @@ -1926,7 +1926,7 @@ pars_create_table( sym_node_t* column_defs, /*!< in: list of column names */ sym_node_t* compact, /* in: non-NULL if COMPACT table. */ sym_node_t* block_size, /* in: block size (can be NULL) */ - void* not_fit_in_memory __attribute__((unused))) + void* not_fit_in_memory MY_ATTRIBUTE((unused))) /*!< in: a non-NULL pointer means that this is a table which in simulations should be simulated as not fitting @@ -2143,7 +2143,7 @@ UNIV_INTERN que_fork_t* pars_stored_procedure_call( /*=======================*/ - sym_node_t* sym_node __attribute__((unused))) + sym_node_t* sym_node MY_ATTRIBUTE((unused))) /*!< in: stored procedure name */ { ut_error; @@ -2203,7 +2203,7 @@ UNIV_INTERN void yyerror( /*====*/ - const char* s __attribute__((unused))) + const char* s MY_ATTRIBUTE((unused))) /*!< in: error message string */ { ut_ad(s); |