diff options
Diffstat (limited to 'sql/sql_join_cache.h')
| -rw-r--r-- | sql/sql_join_cache.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/sql/sql_join_cache.h b/sql/sql_join_cache.h index ba8e4ba8e4a..6953f6881ee 100644 --- a/sql/sql_join_cache.h +++ b/sql/sql_join_cache.h @@ -1,4 +1,20 @@ /* + Copyright (c) 2011, 2012, Monty Program Ab + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +/* This file contains declarations for implementations of block based join algorithms */ @@ -550,7 +566,7 @@ public: BNL_JOIN_ALG, /* Block Nested Loop Join algorithm */ BNLH_JOIN_ALG, /* Block Nested Loop Hash Join algorithm */ BKA_JOIN_ALG, /* Batched Key Access Join algorithm */ - BKAH_JOIN_ALG, /* Batched Key Access with Hash Table Join Algorithm */ + BKAH_JOIN_ALG /* Batched Key Access with Hash Table Join Algorithm */ }; /* @@ -649,7 +665,7 @@ public: void reset_join(JOIN *j) { join= j; } void free() { - x_free(buff); + my_free(buff); buff= 0; } |