diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 12:23:57 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 12:23:57 +0400 |
| commit | e47ab5a604954b0019ea9fe90cdb91023e55be07 (patch) | |
| tree | 703aceeb455a79b6ec6291bdc71ff13ffa24a2c0 /sql/sql_load.cc | |
| parent | ad43230e3bd5a419709a2559478be5cfb2cae3d2 (diff) | |
| parent | 455f754e6ba4de3d3b527aad6ac317b7e5994b86 (diff) | |
| download | mariadb-git-e47ab5a604954b0019ea9fe90cdb91023e55be07.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Text conflict in sql/log.cc
Text conflict in sql/log.h
Text conflict in sql/sql_class.cc
Text conflict in sql/sql_load.cc
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 59d30b020e8..6e8913b171d 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -563,7 +563,6 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, else { Delete_file_log_event d(thd, db, transactional_table); - d.flags|= LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F; (void) mysql_bin_log.write(&d); } } @@ -744,7 +743,6 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex, (duplicates == DUP_REPLACE) ? LOAD_DUP_REPLACE : (ignore ? LOAD_DUP_IGNORE : LOAD_DUP_ERROR), transactional_table, FALSE, FALSE, errcode); - e.flags|= LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F; return mysql_bin_log.write(&e); } |