diff options
author | Monty <monty@mariadb.org> | 2016-12-27 17:18:10 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2017-01-11 09:18:35 +0200 |
commit | 7454087d071d1c1954c51f08ccd7a29682cd9da8 (patch) | |
tree | d309b2aa617d8f960db1a1fda3fa0dd7066eef16 /sql/sql_load.cc | |
parent | 1628a2ae27cfc8b96e4b50d85d430955625e2d88 (diff) | |
download | mariadb-git-7454087d071d1c1954c51f08ccd7a29682cd9da8.tar.gz |
Revert "bugfix: UPDATE and virtual BLOBs"
This reverts commit f73bdb685d77b944f4565e0a97778faa30999145.
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r-- | sql/sql_load.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index c25e73e7346..6f0e97a61c9 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -537,12 +537,6 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, !(thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES))) ? (*escaped)[0] : INT_MAX; - if (handle_duplicates != DUP_ERROR) - { - info.vblobs0.init(table); - info.vblobs1.init(table); - } - READ_INFO read_info(thd, file, tot_length, ex->cs ? ex->cs : thd->variables.collation_database, *field_term,*ex->line_start, *ex->line_term, *enclosed, |