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

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-01-16 03:18:14 +02:00
parent ebb8c9fb26 66744f4540
commit 8e15768731
180 changed files with 10586 additions and 2507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_parse.cc
View File

@@ -5470,11 +5470,8 @@ end_with_restore_list:
}
case SQLCOM_SHOW_CREATE_TRIGGER:
{
if (lex->spname->m_name.length > NAME_LEN)
{
my_error(ER_TOO_LONG_IDENT, MYF(0), lex->spname->m_name.str);
if (check_ident_length(&lex->spname->m_name))
goto error;
}
#ifdef WITH_WSREP
if (WSREP_CLIENT(thd) && wsrep_sync_wait(thd)) goto error;
@@ -9101,6 +9098,18 @@ bool check_string_char_length(LEX_STRING *str, uint err_msg,
return TRUE;
}
bool check_ident_length(LEX_STRING *ident)
{
if (check_string_char_length(ident, 0, NAME_CHAR_LEN, system_charset_info, 1))
{
my_error(ER_TOO_LONG_IDENT, MYF(0), ident->str);
return 1;
}
return 0;
}
C_MODE_START
/*