diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-07-03 14:02:05 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-07-03 14:02:05 +0400 |
| commit | e61568ee9305c6c93c1a9f298a7fe04532881f24 (patch) | |
| tree | c80b0967460f7c4f8743831690f7369e11c73722 /sql/sql_handler.cc | |
| parent | 4b0cedf82d8d8ba582648dcb4a2620c146862a43 (diff) | |
| parent | c3289d27eef39a47fed2ce1ff239013ed6870f39 (diff) | |
| download | mariadb-git-e61568ee9305c6c93c1a9f298a7fe04532881f24.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 7c2ccf1b155..72df8367dc7 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -1029,6 +1029,7 @@ SQL_HANDLER *mysql_ha_read_prepare(THD *thd, TABLE_LIST *tables, if (!(handler= mysql_ha_find_handler(thd, &tables->alias))) DBUG_RETURN(0); tables->table= handler->table; // This is used by fix_fields + handler->table->pos_in_table_list= tables; if (mysql_ha_fix_cond_and_key(handler, mode, keyname, key_expr, ha_rkey_mode, cond, 1)) DBUG_RETURN(0); |