diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 17:59:31 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 17:59:31 +0300 |
| commit | 170bec36c0da1fb0269a063094a546022ed0888f (patch) | |
| tree | 044ce4d6375d9b058fdf5ea984820313d76d7ce1 /sql | |
| parent | 6b8d34fe0d5e73a469383bcb0818d3ff91ed9a84 (diff) | |
| parent | ca733d03c82b02cd842ff2a226fee7b12eb86f8d (diff) | |
| download | mariadb-git-170bec36c0da1fb0269a063094a546022ed0888f.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql')
| -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 52ce42e2e6a..feaf119ba9e 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -986,6 +986,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); |