diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-19 19:36:14 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-19 19:36:14 +0300 |
| commit | a6667f8577b0830f27dfbafb48561c23aee08ebd (patch) | |
| tree | 688c26274e23ab44604f2f276f6a5c78e49241bf /sql/sql_load.cc | |
| parent | 40271e4f5edacc6fe90ed74a087e5ff25daea899 (diff) | |
| parent | 0835775b7c3b074332800ee92112d68b28cec083 (diff) | |
| download | mariadb-git-a6667f8577b0830f27dfbafb48561c23aee08ebd.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- configure.in
- include/m_string.h
- mysql-test/extra/rpl_tests/rpl_row_func003.test
- mysql-test/r/mysqlbinlog.result
- mysql-test/r/union.result
- mysql-test/suite/binlog/r/binlog_killed_simulate.result
- mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
- mysql-test/suite/binlog/r/binlog_unsafe.result
- mysql-test/suite/binlog/t/binlog_unsafe.test
- mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
- mysql-test/suite/rpl/r/rpl_loaddata_map.result
- mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
- mysql-test/suite/rpl/r/rpl_stm_log.result
- mysql-test/suite/rpl/t/rpl_optimize.test
- mysql-test/t/mysqlbinlog.test
- mysql-test/t/union.test
- sql/rpl_utility.h
- sql/sql_union.cc
- strings/Makefile.am
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 9c621944f2a..b8ba16f2fb1 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -683,7 +683,11 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex, if (n++) pfields.append(", "); if (item->name) + { + pfields.append("`"); pfields.append(item->name); + pfields.append("`"); + } else item->print(&pfields, QT_ORDINARY); } @@ -703,7 +707,9 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex, val= lv++; if (n++) pfields.append(", "); + pfields.append("`"); pfields.append(item->name); + pfields.append("`"); pfields.append("="); val->print(&pfields, QT_ORDINARY); } |