diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-02-01 15:48:02 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-02-01 15:48:02 -0800 |
| commit | 7b79d8a33f56d178c78209f910a0694807a63f8f (patch) | |
| tree | 3d4a8131e8688c6599461bfce72bb87c718a53e4 /sql/sql_select.h | |
| parent | 7ed15e6e50aec65560d8988fc5713f1f489b6616 (diff) | |
| parent | 81690cf326e09799ca77d9f7bc5601905b706548 (diff) | |
| download | mariadb-git-7b79d8a33f56d178c78209f910a0694807a63f8f.tar.gz | |
Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 002c5a2df5a..a5fa59a070a 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1456,6 +1456,7 @@ public: virtual ~store_key() {} /** Not actually needed */ virtual enum Type type() const=0; virtual const char *name() const=0; + virtual bool store_key_is_const() { return false; } /** @brief sets ignore truncation warnings mode and calls the real copy method @@ -1609,6 +1610,7 @@ public: enum Type type() const { return CONST_ITEM_STORE_KEY; } const char *name() const { return "const"; } + bool store_key_is_const() { return true; } protected: enum store_key_result copy_inner() |