diff options
| author | unknown <mskold/marty@linux.site> | 2007-04-04 17:03:31 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2007-04-04 17:03:31 +0200 |
| commit | 7279edc72dd951e356db1cf9842115452a5773a1 (patch) | |
| tree | dd37944358fa408c8d0b0528e0d416320718c1e4 /sql/sql_load.cc | |
| parent | 2770bf0bfcc73c78b37320c4662c27c72b9d9e12 (diff) | |
| parent | 59a64c2b1604649be464d38141e2345c79d27bd3 (diff) | |
| download | mariadb-git-7279edc72dd951e356db1cf9842115452a5773a1.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
include/my_base.h:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_trigger.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/ha_ndbcluster.cc:
Merge
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 7d2c2281bba..4838474b115 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -226,7 +226,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, DBUG_RETURN(TRUE); } - table->mark_columns_needed_for_insert(); + prepare_triggers_for_insert_stmt(table); uint tot_length=0; bool use_blobs= 0, use_vars= 0; |