diff options
author | unknown <bell@sanja.is.com.ua> | 2004-02-09 12:10:12 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-02-09 12:10:12 +0200 |
commit | 584ddfdab2316c0b0520c6903fe6bf4b8a435b0a (patch) | |
tree | 4b7dc051ca61468dc50e8f7ab046eb07b55e7c3a /sql/sql_select.h | |
parent | faa8a41b1db57e643617eda8c49803f6e1287f87 (diff) | |
parent | 1f739ca45eb009de8dadd4503374bc4a5c6bf5c0 (diff) | |
download | mariadb-git-584ddfdab2316c0b0520c6903fe6bf4b8a435b0a.tar.gz |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r-- | sql/sql_select.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index ed650c450c0..a463378006b 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -428,7 +428,6 @@ public: bool cp_buffer_from_ref(TABLE_REF *ref); bool error_if_full_join(JOIN *join); -void relink_tables(SELECT_LEX *select_lex); int report_error(TABLE *table, int error); int safe_index_read(JOIN_TAB *tab); COND *eliminate_not_funcs(COND *cond); |