diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-15 09:54:19 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-15 09:54:19 +0300 |
| commit | ccd828900b1d7cbb4e68562b06e1d8d7455eea5e (patch) | |
| tree | 8af6b315e91238a5e5102bbf069129cfc58554b0 /sql/opt_range.cc | |
| parent | 5c9e0cdc5309a7f16aa57a9a99e11f0c7740e7ec (diff) | |
| download | mariadb-git-ccd828900b1d7cbb4e68562b06e1d8d7455eea5e.tar.gz | |
Cleanups to recent patches
Fix packet error when using wrong GRANT command
include/config-win.h:
Changed back to test for HAVE_SETFILEPOINTER instead of operating system
mysql-test/r/grant.result:
Extra test to catch wrong packet bug
mysql-test/t/grant.test:
Extra test to catch wrong packet bug
mysys/my_chsize.c:
Cleanup
sql/opt_range.cc:
Fix to recent BETWEEN patch
sql/sql_acl.cc:
Fix packet error when using wrong GRANT command
sql/sql_select.cc:
Cleanups
Added not critical out-of-memory check
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index c7bad3b18f3..349a5d0271c 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -798,7 +798,8 @@ static SEL_TREE *get_mm_tree(PARAM *param,COND *cond) table_map ref_tables=cond->used_tables(); if (cond->type() != Item::FUNC_ITEM) { // Should be a field - if (ref_tables & param->current_table) + if ((ref_tables & param->current_table) || + (ref_tables & ~(param->prev_tables | param->read_tables))) DBUG_RETURN(0); DBUG_RETURN(new SEL_TREE(SEL_TREE::MAYBE)); } |