diff options
author | Alexander Nozdrin <alik@sun.com> | 2010-02-24 10:32:22 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2010-02-24 10:32:22 +0300 |
commit | 5fb9f61e4faf24cbc364108c0709fa935f2c3a09 (patch) | |
tree | 7b877fd684c7e308b5694b7a837885828fa18460 /sql/opt_range.cc | |
parent | 4836199d701af05a9c89563b642c51ee5640e804 (diff) | |
parent | 5994f28470c0a2d9fbef329062f482fd0a40243b (diff) | |
download | mariadb-git-5fb9f61e4faf24cbc364108c0709fa935f2c3a09.tar.gz |
Auto-merge from mysql-next-mr-bugfixing.
Diffstat (limited to 'sql/opt_range.cc')
-rw-r--r-- | sql/opt_range.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index b9ea8c7c991..68285563239 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2266,9 +2266,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, keys_to_use.intersect(head->keys_in_use_for_query); if (!keys_to_use.is_clear_all()) { -#ifndef EMBEDDED_LIBRARY // Avoid compiler warning uchar buff[STACK_BUFF_ALLOC]; -#endif MEM_ROOT alloc; SEL_TREE *tree= NULL; KEY_PART *key_parts; |