diff options
author | unknown <kostja@bodhi.(none)> | 2007-07-21 17:52:16 +0400 |
---|---|---|
committer | unknown <kostja@bodhi.(none)> | 2007-07-21 17:52:16 +0400 |
commit | be7b4043b95f92781f7ef3e425f0b0c148b8306b (patch) | |
tree | 780b4be27bfa13e604346c4490f2219a0e89dd06 /sql/sql_class.h | |
parent | d758b1e629a78e1cf58c8a04da51e3c33630368c (diff) | |
parent | 7a99db0b7308f1636bbc7fafe36b478968497e50 (diff) | |
download | mariadb-git-be7b4043b95f92781f7ef3e425f0b0c148b8306b.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 445a3ce437c..058f130d4e7 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -450,7 +450,7 @@ public: Table_ident *table, List<key_part_spec> &ref_cols, uint delete_opt_arg, uint update_opt_arg, uint match_opt_arg) :Key(FOREIGN_KEY, name_arg, HA_KEY_ALG_UNDEF, 0, cols), - ref_table(table), ref_columns(cols), + ref_table(table), ref_columns(ref_cols), delete_opt(delete_opt_arg), update_opt(update_opt_arg), match_opt(match_opt_arg) {} |