diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-27 20:38:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-27 20:38:05 +0200 |
| commit | d1a11568c7c187b8fb62be92a3276ec0f1a89df9 (patch) | |
| tree | 38c07b209b9458f9aa6e8acca272c6fe1adb83c4 | |
| parent | 658992699b204da04382142e77af042c8a33a334 (diff) | |
| download | mariadb-git-d1a11568c7c187b8fb62be92a3276ec0f1a89df9.tar.gz | |
cleanup: safer versions of PSI no-op macros
| -rw-r--r-- | include/mysql/psi/mysql_table.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/mysql/psi/mysql_table.h b/include/mysql/psi/mysql_table.h index bf744ec664c..74217a32b13 100644 --- a/include/mysql/psi/mysql_table.h +++ b/include/mysql/psi/mysql_table.h @@ -41,16 +41,16 @@ #define PSI_CALL_release_table_share PSI_TABLE_CALL(release_table_share) #define PSI_CALL_drop_table_share PSI_TABLE_CALL(drop_table_share) #else -#define MYSQL_UNBIND_TABLE(handler) /* no-op */ -#define MYSQL_REBIND_TABLE(handler) /* no-op */ +#define MYSQL_UNBIND_TABLE(handler) do { } while(0) +#define MYSQL_REBIND_TABLE(handler) do { } while(0) -#define PSI_CALL_unbind_table(A1) /* no-op */ +#define PSI_CALL_unbind_table(A1) do { } while(0) #define PSI_CALL_rebind_table(A1,A2,A3) NULL -#define PSI_CALL_close_table(A1) /* no-op */ +#define PSI_CALL_close_table(A1) do { } while(0) #define PSI_CALL_open_table(A1,A2) NULL #define PSI_CALL_get_table_share(A1,A2) NULL -#define PSI_CALL_release_table_share(A1) /* no-op */ -#define PSI_CALL_drop_table_share(A1,A2,A3,A4,A5) /* no-op */ +#define PSI_CALL_release_table_share(A1) do { } while(0) +#define PSI_CALL_drop_table_share(A1,A2,A3,A4,A5) do { } while(0) #endif /** |