diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-05 08:39:12 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-05 08:39:12 +0200 |
| commit | 499d058c2d4a3a21ece73ccfccebca62672a6517 (patch) | |
| tree | 65f485d2be885f33d90600d09460d7d0e3505d99 /sql/sql_load.cc | |
| parent | 865cd0108a718d0231daf98367f64fce0c46d3f3 (diff) | |
| parent | cfe2d1da886ea48c445076a3509b76ea1242e54d (diff) | |
| download | mariadb-git-499d058c2d4a3a21ece73ccfccebca62672a6517.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-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 7a535381c01..6984da6a0b0 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -222,7 +222,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, DBUG_RETURN(TRUE); } - mark_fields_used_by_triggers_for_insert_stmt(thd, table, handle_duplicates); + prepare_triggers_for_insert_stmt(thd, table, handle_duplicates); uint tot_length=0; bool use_blobs= 0, use_vars= 0; |