summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-09-11 21:31:03 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-09-11 21:31:03 +0300
commit1bf3e8ab43e982953d7534db902020d321364afb (patch)
tree7de4aaac9f947d4302cd4edbb5677da8917ade71 /sql/field.h
parentf5bebaf1d6a0ff2fca9b342ed5910b9d34a276bb (diff)
parent4901f31c13f91e130f077f2f77b32c40b0036e32 (diff)
downloadmariadb-git-1bf3e8ab43e982953d7534db902020d321364afb.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index 8b080a0d06f..ed61afe01eb 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -2390,7 +2390,6 @@ public:
{
return unpack_int64(to, from, from_end);
}
-
void set_max();
bool is_max();
};