diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-04 02:09:56 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-04 02:09:56 +0500 |
| commit | c700a77623b790bf373795c80ac22cdced3a4076 (patch) | |
| tree | 300828c93ebcb6bfe0b1e0304f1ab84659ed7f7c /sql/sql_load.cc | |
| parent | 81194444f81b60f1bb4a6c58f676f26c267660eb (diff) | |
| parent | f57e4b99e794ef14a845fd4e73ccd1eb6a90d459 (diff) | |
| download | mariadb-git-c700a77623b790bf373795c80ac22cdced3a4076.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/4.1-opt
into gleb.loc:/home/uchum/work/bk/5.0-opt
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_load.cc:
Auto merged
mysql-test/r/loaddata.result:
Merge with 4.1-opt.
mysql-test/t/loaddata.test:
Merge with 4.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 c2267ba5dfc..7b1799baaad 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -847,6 +847,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'; |