diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 18:55:27 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 18:55:27 +0300 |
| commit | aa59ecec89d89a29f7272352471a4064aa6db28c (patch) | |
| tree | a8b2b53ce4913adc27291105fbbe5389333607eb /sql/sql_handler.cc | |
| parent | 7bbe324fc17d9734833f717921629c36d1d0c996 (diff) | |
| parent | 170bec36c0da1fb0269a063094a546022ed0888f (diff) | |
| download | mariadb-git-aa59ecec89d89a29f7272352471a4064aa6db28c.tar.gz | |
Merge branch '10.0' into 10.1
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 8aee34a484d..5a022ba72cf 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -987,6 +987,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, cond, 1)) DBUG_RETURN(0); DBUG_RETURN(handler); |