diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-25 16:04:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-25 16:04:35 +0100 |
| commit | 0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2 (patch) | |
| tree | 5c67457ff8abbb89b203a7f55cda776b738c385b /sql/item_xmlfunc.cc | |
| parent | 6324c36bd703a0f55dcd49dd721af262f73cf7aa (diff) | |
| parent | ff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e (diff) | |
| download | mariadb-git-0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index e238668d6ab..064038a06fe 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. +/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -226,6 +226,9 @@ public: { max_length= MAX_BLOB_WIDTH; collation.collation= pxml->charset(); + // To avoid premature evaluation, mark all nodeset functions as non-const. + used_tables_cache= RAND_TABLE_BIT; + const_item_cache= false; } const char *func_name() const { return "nodeset"; } bool check_vcol_func_processor(uchar *int_arg) |