diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-04 16:58:25 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-04 16:58:25 +0200 |
| commit | 59a64c2b1604649be464d38141e2345c79d27bd3 (patch) | |
| tree | 6acff3a6424bc60fd3c4962c4f0bb86670e5d3a0 /sql/sql_load.cc | |
| parent | 655a58d85c5b83824ceec5a7041bbb3b84b5731a (diff) | |
| download | mariadb-git-59a64c2b1604649be464d38141e2345c79d27bd3.tar.gz | |
Merge from 5.0
mysql-test/r/ndb_trigger.result:
Re-generated
sql/mysql_priv.h:
Merge
sql/sql_insert.cc:
Merge
sql/sql_load.cc:
Merge
sql/sql_update.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 364fda2c94b..01b64b29280 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; |