diff options
| author | Gopal Shankar <gopal.shankar@oracle.com> | 2012-01-30 19:00:04 +0530 |
|---|---|---|
| committer | Gopal Shankar <gopal.shankar@oracle.com> | 2012-01-30 19:00:04 +0530 |
| commit | 225f0cd53d547927dc6d528a4e78c1be5e07cbc6 (patch) | |
| tree | ece8fe569fecaea85d89fddd305cae0b0870a873 /sql/sql_class.cc | |
| parent | 166131c51a0c09c239421fa0887e6a0fe8213b6e (diff) | |
| parent | 7f0f18cd6ecd5a40f45393bfcc678350855f1513 (diff) | |
| download | mariadb-git-225f0cd53d547927dc6d528a4e78c1be5e07cbc6.tar.gz | |
Merged from mysql-5.1-security
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index a644729961c..b68726c2920 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -138,9 +138,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) |