diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-11-03 08:47:27 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-11-03 08:47:27 +0200 |
| commit | 22c9da4dee3f5c7b1f780aa47f1a361191e51487 (patch) | |
| tree | ca329753665df8a7975955ea3305501d9dcb6ccd /sql/item_subselect.h | |
| parent | 5337ffde112ebc041f4048fcc3b152ca6b4d5cec (diff) | |
| parent | 6d9ad5db3a9dd558ae136717acfc884683a33975 (diff) | |
| download | mariadb-git-22c9da4dee3f5c7b1f780aa47f1a361191e51487.tar.gz | |
Merge
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/item_subselect.cc:
SCCS merged
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 8d438d0e72f..26e165df3d3 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -210,10 +210,8 @@ public: } trans_res select_transformer(JOIN *join); trans_res single_value_transformer(JOIN *join, - Item *left_expr, compare_func_creator func); - trans_res row_value_transformer(JOIN * join, - Item *left_expr); + trans_res row_value_transformer(JOIN * join); longlong val_int(); double val(); String *val_str(String*); |