summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2005-04-20 12:09:56 +0400
committerunknown <sergefp@mysql.com>2005-04-20 12:09:56 +0400
commitb529fed6833047a8e729773419b369111a4c1f4c (patch)
treed5bf3f9c6b95a519113b29fce207eb3de476c588 /sql/sql_select.h
parent58ffacc4453d754b32c6ab3f024d462c2257d93b (diff)
parent955ec71f78a16cd6de19cd48cb7faa2874f5cdc9 (diff)
downloadmariadb-git-b529fed6833047a8e729773419b369111a4c1f4c.tar.gz
BUG#9103 merge to 5.0
sql/sql_select.h: Auto merged
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index e9397925b6a..c9a9b26d1b4 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -520,7 +520,7 @@ public:
const char *name() const { return "const"; }
};
-bool cp_buffer_from_ref(TABLE_REF *ref);
+bool cp_buffer_from_ref(THD *thd, TABLE_REF *ref);
bool error_if_full_join(JOIN *join);
int report_error(TABLE *table, int error);
int safe_index_read(JOIN_TAB *tab);