summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2015-10-15 18:25:54 +0400
committerAlexander Barkov <bar@mariadb.org>2015-10-15 18:25:54 +0400
commit7e29f2d64fb463559a7c9c178ffe899b9bcab113 (patch)
treeba7739691d617d03c86afade3d2a2980f792384e /sql/field.h
parent199378028430dd8e84ec10b111851d255000c2f1 (diff)
downloadmariadb-git-7e29f2d64fb463559a7c9c178ffe899b9bcab113.tar.gz
MDEV-8948 ALTER ... INPLACE does work for BINARY, BLOBmariadb-10.1.8
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/sql/field.h b/sql/field.h
index b24561d7dd9..e3f2fa5b1ca 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1448,10 +1448,6 @@ protected:
const uchar *unpack_int64(uchar* to, const uchar *from, const uchar *from_end)
{ return unpack_int(to, from, from_end, 8); }
- bool field_flags_are_binary()
- {
- return (flags & (BINCMP_FLAG | BINARY_FLAG)) != 0;
- }
double pos_in_interval_val_real(Field *min, Field *max);
double pos_in_interval_val_str(Field *min, Field *max, uint data_offset);
};
@@ -3130,6 +3126,7 @@ public:
const Item *item,
bool is_eq_func) const;
void sql_type(String &str) const;
+ uint is_equal(Create_field *new_field);
int store(const char *to, uint length, CHARSET_INFO *charset);
int store(double nr);
int store(longlong nr, bool unsigned_val);
@@ -3503,11 +3500,6 @@ public:
bool check(THD *thd);
- bool field_flags_are_binary()
- {
- return (flags & (BINCMP_FLAG | BINARY_FLAG)) != 0;
- }
-
ha_storage_media field_storage_type() const
{
return (ha_storage_media)