diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-04 11:46:45 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-04 11:46:45 +0300 |
| commit | 589762cff779afa99a5c0fb4e9c0dc21e493154c (patch) | |
| tree | f0577c58f0635bb6dd887750a45091691f20c1db /sql/sql_load.cc | |
| parent | 6097e627b43b5486564a571e7e2cf28d2c3c834a (diff) | |
| parent | 8d035c57f0c5c65ecf9652bd913b3d2f988c8f6e (diff) | |
| download | mariadb-git-589762cff779afa99a5c0fb4e9c0dc21e493154c.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
mysql-test/r/loaddata.result:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/uniques.cc:
Auto merged
mysql-test/include/mix1.inc:
manual merge 5.0-opt -> 5.1-opt
mysql-test/r/innodb_mysql.result:
manual merge 5.0-opt -> 5.1-opt
sql/log.cc:
manual merge 5.0-opt -> 5.1-opt
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 0138030487b..3ffbdf83815 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -851,6 +851,7 @@ continue_loop:; char READ_INFO::unescape(char chr) { + /* keep this switch synchornous with the ESCAPE_CHARS macro */ switch(chr) { case 'n': return '\n'; case 't': return '\t'; |