Skip to content

M
MariaDB
Commit 3c899918 authored by unknown's avatar unknown
Browse files
Options

Merge 


mysql-test/r/select.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
parents 8b5dd649 e2d1ab84
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
sql/sql_base.cc
View file @ 3c899918
...@@ -1851,6 +1851,7 @@ bool setup_tables(TABLE_LIST *tables) ...@@ -1851,6 +1851,7 @@ bool setup_tables(TABLE_LIST *tables)
for (Field **ptr=table->field ; *ptr ; ptr++) for (Field **ptr=table->field ; *ptr ; ptr++)
(*ptr)->query_id=0; (*ptr)->query_id=0;
} }
table->used_keys&= table->keys_in_use_for_query;
} }
if (tablenr > MAX_TABLES) if (tablenr > MAX_TABLES)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7