database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2017-09-28 18:56:15 +04:00
parent 4a32e2395e 7131a0a803
commit 67eb1252ac
32 changed files with 959 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.h
View File

@ -1081,6 +1081,10 @@ public:
{
return static_cast<uint32>(query_string.length());
}
inline char *query_end() const
{
return query_string.str() + query_string.length();
}
CHARSET_INFO *query_charset() const { return query_string.charset(); }
void set_query_inner(const CSET_STRING &string_arg)
{
@ -5587,6 +5591,7 @@ public:
{
db= *db_name;
}
bool resolve_table_rowtype_ref(THD *thd, Row_definition_list &defs);
};
@ -5610,6 +5615,7 @@ public:
:Table_ident(thd, db, table, false),
m_column(*column)
{ }
bool resolve_type_ref(THD *thd, Column_definition *def);
};