diff options
author | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-05-18 10:10:30 +0200 |
---|---|---|
committer | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-05-18 10:10:30 +0200 |
commit | 9c4eb2910bf64871e8f22bbcc3c901515dffaf6b (patch) | |
tree | c42b20866050f15473e40dfb8cde9fd32cddce30 /sql/sql_plugin.cc | |
parent | 0b608e98bb190244136c109ea31762d672e634cd (diff) | |
download | mariadb-git-9c4eb2910bf64871e8f22bbcc3c901515dffaf6b.tar.gz |
Bug#19027 MySQL 5.0 starts even with Fatal InnoDB errors
convert_dash_to_underscore was supplied with a character length containing
my byte too many which caused valgrind errors of invalid read.
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index b5c7ceda6ab..da168d36429 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -3314,7 +3314,7 @@ static int test_plugin_options(MEM_ROOT *tmp_root, struct st_plugin_int *tmp, varname= (char*) alloc_root(mem_root, len); strxmov(varname, tmp->name.str, "-", o->name, NullS); my_casedn_str(&my_charset_latin1, varname); - convert_dash_to_underscore(varname, len); + convert_dash_to_underscore(varname, len-1); v= new (mem_root) sys_var_pluginvar(varname, o); } DBUG_ASSERT(v); /* check that an object was actually constructed */ |