summaryrefslogtreecommitdiff
path: root/sql/sql_explain.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2017-11-14 07:47:58 +0200
committerMichael Widenius <monty@mariadb.org>2017-11-17 07:30:05 +0200
commit87933d52619c3f0df84922e23d5a8b03fa050133 (patch)
tree6e495d5f9bf731b055a4d7a582fa092d19c5929f /sql/sql_explain.h
parent31bd86c8df63a4d9e98d67541e136456bd6d9cc2 (diff)
downloadmariadb-git-87933d52619c3f0df84922e23d5a8b03fa050133.tar.gz
Handle failures from malloc
Most "new" failures fixed in the following files: - sql_select.cc - item.cc - item_func.cc - opt_subselect.cc Other things: - Allocate udf_handler strings in mem_root - Required changes in sql_string.h - Add mem_root as argument to some new [] calls - Mark udf_handler strings as thread specific - Removed some comment blocks with code
Diffstat (limited to 'sql/sql_explain.h')
-rw-r--r--sql/sql_explain.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_explain.h b/sql/sql_explain.h
index 154769fe289..895c059f1b0 100644
--- a/sql/sql_explain.h
+++ b/sql/sql_explain.h
@@ -589,8 +589,8 @@ public:
key_name= NULL;
key_len= (uint)-1;
}
- void set(MEM_ROOT *root, KEY *key_name, uint key_len_arg);
- void set_pseudo_key(MEM_ROOT *root, const char *key_name);
+ bool set(MEM_ROOT *root, KEY *key_name, uint key_len_arg);
+ bool set_pseudo_key(MEM_ROOT *root, const char *key_name);
inline const char *get_key_name() const { return key_name; }
inline uint get_key_len() const { return key_len; }