diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-10-09 10:30:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-10-09 10:30:11 +0200 |
| commit | 1b75bed00fa4ea3925f513f4825deb00cb158d5b (patch) | |
| tree | 0822ed2a2ca42ba1acb82a6737336bbfe219bebe /sql/sql_priv.h | |
| parent | 689ffe3559a4b7bacd13503ba93659b2f4560bbb (diff) | |
| parent | b2d71434ed24d0901155fe68b0b7ee4fdad0e2d4 (diff) | |
| download | mariadb-git-1b75bed00fa4ea3925f513f4825deb00cb158d5b.tar.gz | |
5.5.40+ merge
Diffstat (limited to 'sql/sql_priv.h')
| -rw-r--r-- | sql/sql_priv.h | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h index 62f84090da8..09a22ba0444 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (c) 2010, 2013, Monty Program Ab. +/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. + Copyright (c) 2010, 2014, Monty Program Ab. 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 @@ -29,10 +29,6 @@ #ifndef MYSQL_CLIENT -#ifndef MY_GLOBAL_INCLUDED -#error "You must include my_global.h first!" -#endif - /* Generates a warning that a feature is deprecated. After a specified version asserts that the feature is removed. @@ -64,6 +60,33 @@ (Old), (New)); \ } while(0) + +/* + Generates a warning that a feature is deprecated and there is no replacement. + + Using it as + + WARN_DEPRECATED_NO_REPLACEMENT(thd, "BAD"); + + Will result in a warning + + "'BAD' is deprecated and will be removed in a future release." + + Note that in macro arguments BAD is not quoted. +*/ + +#define WARN_DEPRECATED_NO_REPLACEMENT(Thd,Old) \ + do { \ + if (((THD *) Thd) != NULL) \ + push_warning_printf(((THD *) Thd), Sql_condition::WARN_LEVEL_WARN, \ + ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT, \ + ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), \ + (Old)); \ + else \ + sql_print_warning("'%s' is deprecated and will be removed " \ + "in a future release.", (Old)); \ + } while(0) + /*************************************************************************/ #endif |