diff options
| author | kevg <claprix@yandex.ru> | 2017-03-06 20:07:10 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-05-05 20:36:29 +0300 |
| commit | 7a22dd37164c1277410319984411994fb098e85b (patch) | |
| tree | a36641c88203974299a31fa50650ddace86f06c6 /sql/sql_base.cc | |
| parent | 9355e3e9661f80bc3a6813411c7d5f33f6fec60d (diff) | |
| download | mariadb-git-7a22dd37164c1277410319984411994fb098e85b.tar.gz | |
SQL: INNER JOIN USING with versioned tables [fixes #147]
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index e8ec8104f8b..b0fe02aba69 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5350,7 +5350,7 @@ find_field_in_natural_join(THD *thd, TABLE_LIST *table_ref, const char *name, { if (!my_strcasecmp(system_charset_info, curr_nj_col->name(), name)) { - if (nj_col) + if (nj_col && !curr_nj_col->table_field->field->vers_sys_field()) { my_error(ER_NON_UNIQ_ERROR, MYF(0), name, thd->where); DBUG_RETURN(NULL); |