database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-15416 Crash when reading I_S.PARAMETERS

Browse Source
This commit is contained in:
Alexander Barkov
2018-02-28 23:05:57 +04:00
parent 5f7c764fe7
commit 4025cfaec0
10 changed files with 1202 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_class.cc
View File

@ -58,6 +58,7 @@
#include "sp_head.h"
#include "sp_rcontext.h"
#include "sp_cache.h"
#include "sql_show.h" // append_identifier
#include "transaction.h"
#include "sql_select.h" /* declares create_tmp_table() */
#include "debug_sync.h"
@ -7626,4 +7627,20 @@ void Database_qualified_name::copy(MEM_ROOT *mem_root,
}
bool Table_ident::append_to(THD *thd, String *str) const
{
return (db.length &&
(append_identifier(thd, str, db.str, db.length) ||
str->append('.'))) ||
append_identifier(thd, str, table.str, table.length);
}
bool Qualified_column_ident::append_to(THD *thd, String *str) const
{
return Table_ident::append_to(thd, str) || str->append('.') ||
append_identifier(thd, str, m_column.str, m_column.length);
}
#endif /* !defined(MYSQL_CLIENT) */