diff options
| author | Monty <monty@mariadb.org> | 2015-08-24 14:42:07 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-08-27 22:21:08 +0300 |
| commit | 3cb578c001b2feabd2410f281d20eb6566371453 (patch) | |
| tree | 4e3781e38f6531ea91ff127c024869c6b88c5849 /sql/parse_file.cc | |
| parent | ba340d8c47657774ba6d69bfc918dbebaaef6086 (diff) | |
| download | mariadb-git-3cb578c001b2feabd2410f281d20eb6566371453.tar.gz | |
MDEV-6152: Remove calls to current_thd while creating Item
- Part 3: Adding mem_root to push_back() and push_front()
Other things:
- Added THD as an argument to some partition functions.
- Added memory overflow checking for XML tag's in read_xml()
Diffstat (limited to 'sql/parse_file.cc')
| -rw-r--r-- | sql/parse_file.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc index 0524dab7139..f3dab4f7b2f 100644 --- a/sql/parse_file.cc +++ b/sql/parse_file.cc @@ -667,7 +667,8 @@ parse_quoted_escaped_string(const char *ptr, const char *end, @param[in] mem_root MEM_ROOT for parameters allocation */ -bool get_file_options_ulllist(const char *&ptr, const char *end, const char *line, +bool get_file_options_ulllist(const char *&ptr, const char *end, + const char *line, uchar* base, File_option *parameter, MEM_ROOT *mem_root) { |