summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2010-10-29 11:35:07 +0200
committerTor Didriksen <tor.didriksen@oracle.com>2010-10-29 11:35:07 +0200
commita5eba94a1d8967d5a8c7e8d3d398a2426453f508 (patch)
tree3b5367570271badde0a44c1bbae03463d30193d6 /sql
parentc3f923857a1cfcec4f1d037b20427931f8fe9a51 (diff)
downloadmariadb-git-a5eba94a1d8967d5a8c7e8d3d398a2426453f508.tar.gz
Bug #52131: SET and ENUM stored endian-dependent in binary log
Post-Push fix, DBUG build broken on freebsd7 sql/field.cc:8456: warning: control reaches end of non-void function sql/field.cc: Return NULL to keep compiler happy.
Diffstat (limited to 'sql')
-rw-r--r--sql/field.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc
index ce1b1fc6eb0..a9b5fedda2d 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -8408,6 +8408,8 @@ uchar *Field_enum::pack(uchar *to, const uchar *from,
default:
DBUG_ASSERT(0);
}
+ MY_ASSERT_UNREACHABLE();
+ DBUG_RETURN(NULL);
}
const uchar *Field_enum::unpack(uchar *to, const uchar *from,
@@ -8430,6 +8432,8 @@ const uchar *Field_enum::unpack(uchar *to, const uchar *from,
default:
DBUG_ASSERT(0);
}
+ MY_ASSERT_UNREACHABLE();
+ DBUG_RETURN(NULL);
}