database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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
2018-01-29 12:44:20 +04:00
parent b4a2baffa8 b12430adc7
commit c7a2f23a7b
56 changed files with 639 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/field.h
View File

@ -1572,6 +1572,7 @@ public:
{
return NULL;
}
virtual bool sp_prepare_and_store_item(THD *thd, Item **value);
friend int cre_myisam(char * name, register TABLE *form, uint options,
ulonglong auto_increment_value);
@ -4063,6 +4064,7 @@ public:
{}
~Field_row();
Virtual_tmp_table **virtual_tmp_table_addr() { return &m_table; }
bool sp_prepare_and_store_item(THD *thd, Item **value);
};