database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

fix tests related to SQL comment length

Browse Source 
tests are:
engines/funcs.jp_comment_column
engines/funcs.jp_comment_index
engines/funcs.jp_comment_table
This commit is contained in:
Eugene Kosov
2020-04-15 13:10:51 +03:00
parent 84db10f27b
commit 6577a7a8f2
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_string.h
View File

@@ -79,7 +79,7 @@ public:
Well_formed_prefix(CHARSET_INFO *cs, const char *str, size_t length) Well_formed_prefix(CHARSET_INFO *cs, const char *str, size_t length)
:Well_formed_prefix_status(cs, str, str + length, length), m_str(str) :Well_formed_prefix_status(cs, str, str + length, length), m_str(str)
{ } { }
Well_formed_prefix(CHARSET_INFO *cs, LEX_STRING str, size_t nchars) Well_formed_prefix(CHARSET_INFO *cs, LEX_CSTRING str, size_t nchars)
:Well_formed_prefix_status(cs, str.str, str.str + str.length, nchars), :Well_formed_prefix_status(cs, str.str, str.str + str.length, nchars),
m_str(str.str) m_str(str.str)
{ } { }

5
sql/sql_table.cc
View File

@@ -4330,11 +4330,8 @@ bool validate_comment_length(THD *thd, LEX_CSTRING *comment, size_t max_len,
if (comment->length == 0) if (comment->length == 0)
DBUG_RETURN(false); DBUG_RETURN(false);
if (max_len > comment->length)
max_len= comment->length;
size_t tmp_len= size_t tmp_len=
Well_formed_prefix(system_charset_info, comment->str, max_len).length(); Well_formed_prefix(system_charset_info, *comment, max_len).length();
if (tmp_len < comment->length) if (tmp_len < comment->length)
{ {
if (thd->is_strict_mode()) if (thd->is_strict_mode())