diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:22:43 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:22:43 +0300 |
commit | c3289d27eef39a47fed2ce1ff239013ed6870f39 (patch) | |
tree | 2a6e2434287921eb6f5f7c7877e8da061803ed9e /sql/sql_handler.cc | |
parent | 358ae4b46dd52b329154cff901b58e96fd223773 (diff) | |
parent | eaab98f7022732b26b4ea590e1bb44308e253be8 (diff) | |
download | mariadb-git-c3289d27eef39a47fed2ce1ff239013ed6870f39.tar.gz |
Merge mariadb-10.3.8 into 10.3
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 c2f161d507d..69ea04a170c 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -1031,6 +1031,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); |