diff options
| author | unknown <monty@mysql.com> | 2004-09-03 22:38:45 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-09-03 22:38:45 +0300 |
| commit | 99be6d3060b894b276c16fb9994dbf486c2d69be (patch) | |
| tree | 9135550a8742bce25308042b7911105df3d70963 /sql/item_subselect.h | |
| parent | 2c3f49a64d773395cc0e41fb35c5b6e3b5a56871 (diff) | |
| parent | d0211cf5beae33c7f33d7aab6acebe13892af47c (diff) | |
| download | mariadb-git-99be6d3060b894b276c16fb9994dbf486c2d69be.tar.gz | |
Merge with pulled code
mysql-test/r/view.result:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.h:
Auto merged
tests/client_test.c:
Auto merged
sql/sql_base.cc:
Merge
sql/sql_insert.cc:
Merge
sql/sql_select.cc:
Merge
sql/sql_view.cc:
Merge
sql/table.cc:
Merge
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 90c301c6571..e5defe24756 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -84,7 +84,6 @@ public: null_value= 1; } virtual trans_res select_transformer(JOIN *join); - virtual trans_res no_select_transform() { return RES_OK; } bool assigned() { return value_assigned; } void assigned(bool a) { value_assigned= a; } enum Type type() const; @@ -220,7 +219,6 @@ public: was_null= 0; } trans_res select_transformer(JOIN *join); - trans_res no_select_transform(); trans_res single_value_transformer(JOIN *join, Comp_creator *func); trans_res row_value_transformer(JOIN * join); |