diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-03-23 22:36:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-03-23 22:36:46 +0100 |
| commit | f67a2211ec48b1b1502a7095c50cd9195d8235f8 (patch) | |
| tree | 93e5d158a4a2a1dca4be915f8cf9dc79b3b6d96c /sql/sql_insert.cc | |
| parent | a75d26946423d2142921411bf7bdc731eba4df1a (diff) | |
| parent | 2783fc7d14bc8ad16acfeb509d3b19615023f47a (diff) | |
| download | mariadb-git-f67a2211ec48b1b1502a7095c50cd9195d8235f8.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index f77d8cb1984..9817b882bdd 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3897,7 +3897,7 @@ Field *Item::create_field_for_create_select(THD *thd, TABLE *table) { Field *def_field, *tmp_field; return ::create_tmp_field(thd, table, this, type(), - (Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0, 0); + (Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0); } |