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

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2015-03-07 13:21:02 +01:00
parent 143f5d9172 d61573d3e5
commit 2db62f686e
728 changed files with 54975 additions and 9803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.h
View File

@ -1809,10 +1809,6 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
bool table_cant_handle_bit_fields,
bool make_copy_field,
uint convert_blob_length);
bool create_internal_tmp_table(TABLE *table, KEY *keyinfo,
TMP_ENGINE_COLUMNDEF *start_recinfo,
TMP_ENGINE_COLUMNDEF **recinfo,
ulonglong options, my_bool big_tables);
/*
General routine to change field->ptr of a NULL-terminated array of Field