summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-08-26 15:28:32 +0400
committerAlexander Barkov <bar@mariadb.com>2019-09-03 05:34:53 +0400
commitdc719597ee0b11da722e9813639e8b48018a8c10 (patch)
tree548b53ee953557ddf6f88191b9e6cf70f74c96a2 /sql/sql_string.h
parent0d6635822094a424f19e753aa24a8424d449dd6a (diff)
downloadmariadb-git-dc719597ee0b11da722e9813639e8b48018a8c10.tar.gz
MDEV-18156 Assertion `0' failed or `btr_validate_index(index, 0, false)' in row_upd_sec_index_entry or error code 126: Index is corrupted upon DELETE with PAD_CHAR_TO_FULL_LENGTH
This change takes into account a column's GENERATED ALWAYS AS expression dependcy on sql_mode's PAD_CHAR_TO_FULL_LENGTH and NO_UNSIGNED_SUBTRACTION flags. Indexed virtual columns as well as persistent generated columns are now not allowed to have such dependencies to avoid inconsistent data or index files on sql_mode changes. So an error is now returned in cases like this: CREATE OR REPLACE TABLE t1 ( a CHAR(5), v VARCHAR(5) AS (a) PERSISTENT -- CHAR->VARCHAR or CHAR->TEXT = ERROR ); Functions RPAD() and RTRIM() can now remove dependency on PAD_CHAR_TO_FULL_LENGTH. So this can be used instead: CREATE OR REPLACE TABLE t1 ( a CHAR(5), v VARCHAR(5) AS (RTRIM(a)) PERSISTENT ); Note, unlike CHAR->VARCHAR and CHAR->TEXT this still works, not RPAD(a) is needed: CREATE OR REPLACE TABLE t1 ( a CHAR(5), v CHAR(5) AS (a) PERSISTENT -- CHAR->CHAR is OK ); More sql_mode flags may affect values of generated columns. They will be addressed separately. See comments in sql_mode.h for implementation details.
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index a7652376bbc..e1d64722898 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -235,6 +235,11 @@ public:
return skr;
}
+ size_t lengthsp() const
+ {
+ return str_charset->cset->lengthsp(str_charset, Ptr, str_length);
+ }
+
void set(String &str,uint32 offset,uint32 arg_length)
{
DBUG_ASSERT(&str != this);