summaryrefslogtreecommitdiff
path: root/sql/sql_list.h
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-03 20:19:36 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-03 20:19:36 -0300
commit878bf8d1b0850fc84d8ba3832569ee934adce299 (patch)
tree306c7d92a2d80aa6a6e6696bb0ba2eaa3075907d /sql/sql_list.h
parent54a5c00de9dfc4649d76297eb51ea89eb1bc93eb (diff)
parent85d281737f0feccbd43d7f025658d260d340dd84 (diff)
downloadmariadb-git-878bf8d1b0850fc84d8ba3832569ee934adce299.tar.gz
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_list.h')
-rw-r--r--sql/sql_list.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_list.h b/sql/sql_list.h
index d57534b0999..5b63e80ae94 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -85,7 +85,7 @@ public:
SQL_I_List() { empty(); }
- SQL_I_List(const SQL_I_List &tmp)
+ SQL_I_List(const SQL_I_List &tmp) : Sql_alloc()
{
elements= tmp.elements;
first= tmp.first;