diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-20 16:21:40 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-20 16:21:40 -0200 |
| commit | 3e9c52250a3ab6664c53ea6b3923acfbe8e09e4e (patch) | |
| tree | d427278052923d3b649a03292a823b7468075b95 /storage/myisammrg | |
| parent | b5bb13ec0380624c2e663a4e9b4b29fe574b3e05 (diff) | |
| download | mariadb-git-3e9c52250a3ab6664c53ea6b3923acfbe8e09e4e.tar.gz | |
Bug#45288: pb2 returns a lot of compilation warnings
Fix assorted warnings that are generated in optimized builds.
Most of it is silencing variables that are set but unused.
This patch also introduces the MY_ASSERT_UNREACHABLE macro
which helps the compiler to deduce that a certain piece of
code is unreachable.
include/my_compiler.h:
Use GCC's __builtin_unreachable if available. It allows
GCC to deduce the unreachability of certain code paths,
thus avoiding warnings that, for example, accused that a
variable could be used without being initialized (due to
unreachable code paths).
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 8e18924c5b8..4c8d45d1fe1 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -415,7 +415,7 @@ static MI_INFO *myisammrg_attach_children_callback(void *callback_param) my_errno= HA_ERR_WRONG_MRG_TABLE_DEF; } DBUG_PRINT("myrg", ("MyISAM handle: 0x%lx my_errno: %d", - my_errno ? NULL : (long) myisam, my_errno)); + my_errno ? 0L : (long) myisam, my_errno)); err: DBUG_RETURN(my_errno ? NULL : myisam); |