summaryrefslogtreecommitdiff
path: root/sql/sql_priv.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2019-02-13 14:59:34 -0800
committerIgor Babaev <igor@askmonty.org>2019-02-13 14:59:34 -0800
commit7d9f45e0729ea9b2f572cfb4023b28c16ab11145 (patch)
tree040e8f220c289652612c6cda14d277435c25ac49 /sql/sql_priv.h
parent62fad4e8e964786cd1c8d675f3c071a405a8d187 (diff)
parenta081a998a62eb0663b5691d0b5c0607465f15c0f (diff)
downloadmariadb-git-bb-10.4-mdev17096.tar.gz
Merge branch '10.4' into bb-10.4-mdev17096bb-10.4-mdev17096
Diffstat (limited to 'sql/sql_priv.h')
-rw-r--r--sql/sql_priv.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
index fa12b645041..d5a69d740ea 100644
--- a/sql/sql_priv.h
+++ b/sql/sql_priv.h
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2018, Oracle and/or its affiliates.
- Copyright (c) 2010, 2018, Monty Program Ab.
+ Copyright (c) 2010, 2019, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -345,11 +345,21 @@
#ifndef MYSQL_CLIENT
/*
- Some defines for exit codes for ::is_equal class functions.
+ Field::is_equal() return codes.
*/
#define IS_EQUAL_NO 0
#define IS_EQUAL_YES 1
+/**
+ new_field has compatible packed representation with old type,
+ so it is theoretically possible to perform change by only updating
+ data dictionary without changing table rows
+*/
#define IS_EQUAL_PACK_LENGTH 2
+/**
+ new_field has a representation that is compatible with the old type
+ when the storage engine advertises HA_EXTENDED_TYPES_CONVERSION
+*/
+#define IS_EQUAL_PACK_LENGTH_EXT 3
enum enum_parsing_place
{