2727 Gleb Shchepa 2008-12-01
After-push commit for bug #33461 to make valgrind happy:
TABLE_LIST doesn't free Strings in its string lists
(TABLE_LIST::use_index and TABLE_liST::ignore_index), so
calling c_ptr_safe() on that Strings leads to memleaks.
OTOH "safe" c_ptr_safe() is not necessary there and we can
replace it with c_ptr().
modified:
sql/sql_view.cc
2726 Matthias Leich 2008-11-28 [merge]
Merge of last pushes into GCA tree, no conflicts
Diff to actual 5.0-bugteam is revno: 2725 only
added:
mysql-test/r/ctype_filesystem.result
mysql-test/r/perror-win.result
mysql-test/t/ctype_filesystem-master.opt
mysql-test/t/ctype_filesystem.test
mysql-test/t/perror-win.test
modified:
extra/perror.c
mysql-test/r/func_sapdb.result
mysql-test/r/innodb_mysql.result
mysql-test/r/subselect.result
mysql-test/r/view.result
mysql-test/t/func_sapdb.test
mysql-test/t/innodb_mysql.test
mysql-test/t/subselect.test
mysql-test/t/view.test
sql/field.cc
sql/item_cmpfunc.cc
sql/item_cmpfunc.h
sql/item_func.cc
sql/item_timefunc.h
sql/my_decimal.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/nt_servc.cc
sql/nt_servc.h
sql/set_var.cc
sql/set_var.h
sql/sql_base.cc
sql/sql_show.cc
sql/sql_update.cc
sql/sql_view.cc
tests/mysql_client_test.c
=== modified file 'sql/sql_view.cc'
--- a/sql/sql_view.cc 2008-11-28 16:13:12 +0000
+++ b/sql/sql_view.cc 2008-12-01 08:14:02 +0000
@@ -985,7 +985,7 @@ bool mysql_make_view(THD *thd, File_pars
if (index_list)
{
DBUG_ASSERT(index_list->head()); // should never fail
- my_error(ER_KEY_DOES_NOT_EXITS, MYF(0), index_list->head()->c_ptr_safe(),
+ my_error(ER_KEY_DOES_NOT_EXITS, MYF(0), index_list->head()->c_ptr(),
table->table_name);
DBUG_RETURN(TRUE);
}
| Thread |
|---|
| • bzr push into mysql-5.0-bugteam branch (gshchepa:2726 to 2727)Bug#33461 | Gleb Shchepa | 1 Dec |