summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-04-05 10:49:38 +0200
committerSergei Golubchik <sergii@pisem.net>2012-04-05 10:49:38 +0200
commitdea3544b2d9bd68961b8e84c3772deda435f15b5 (patch)
treed65a66f9f2f9378a1f4ca014e18952ae514f4cb1 /sql/sql_class.cc
parentc72d5e80c53c53a9a847b1c3b6ac66a7ad7eb815 (diff)
parentceec7cea338e117d15a9679e517cc2bb24d44fcc (diff)
downloadmariadb-git-dea3544b2d9bd68961b8e84c3772deda435f15b5.tar.gz
mysql-5.1.62 merge
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 49710d5dbcc..5d81c57d302 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -123,9 +123,9 @@ Key::Key(const Key &rhs, MEM_ROOT *mem_root)
*/
Foreign_key::Foreign_key(const Foreign_key &rhs, MEM_ROOT *mem_root)
- :Key(rhs),
+ :Key(rhs,mem_root),
ref_table(rhs.ref_table),
- ref_columns(rhs.ref_columns),
+ ref_columns(rhs.ref_columns,mem_root),
delete_opt(rhs.delete_opt),
update_opt(rhs.update_opt),
match_opt(rhs.match_opt)