diff options
author | Igor Babaev <igor@askmonty.org> | 2016-09-01 23:37:27 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2016-09-01 23:37:27 -0700 |
commit | 4de75afb454cc5e032c185e2257cdbb7a4010b0d (patch) | |
tree | c1f50aca1f273910d31b10928c4e96c3f5af4bfc /sql/table.cc | |
parent | 17622bc088accfee1873a1854ce0b26f6190e5c3 (diff) | |
download | mariadb-git-4de75afb454cc5e032c185e2257cdbb7a4010b0d.tar.gz |
Fixed the previous merge to be able to build mysqld.
Adjusted one result file.
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 1b2b7352046..42ed08233af 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -7950,7 +7950,7 @@ void TABLE_LIST::check_pushable_cond_for_table(Item *cond) } } else if (cond->walk(&Item::exclusive_dependence_on_table_processor, - 0, (uchar *) &tab_map)) + 0, (void *) &tab_map)) cond->set_extraction_flag(NO_EXTRACTION_FL); } |