diff options
| author | unknown <kostja@bodhi.local> | 2007-01-15 23:51:52 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2007-01-15 23:51:52 +0300 |
| commit | c8fccee6c4eb6e9a6b4e1bb50cffa1b16ecf4719 (patch) | |
| tree | dc7e23d48e8c7bba1382d56a1351616e95a8d6d5 /sql/sql_string.cc | |
| parent | ffbb896b127ea411ae4ce719ba595175b9cafc14 (diff) | |
| parent | 31e01f0a74dd4988ab0628ff0d1b832a190340fe (diff) | |
| download | mariadb-git-c8fccee6c4eb6e9a6b4e1bb50cffa1b16ecf4719.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-root
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
Auto merged
mysql-test/r/view.result:
Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
Auto merged
mysys/my_read.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
server-tools/instance-manager/listener.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/heap/hp_block.c:
Auto merged
storage/heap/hp_write.c:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/ha/ha0ha.c:
Auto merged
storage/innobase/include/hash0hash.h:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
support-files/MySQL-shared-compat.spec.sh:
Auto merged
tests/mysql_client_test.c:
Auto merged
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
SCCS merged
mysql-test/t/view.test:
Manual merge.
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index b307953addc..2aaab83796f 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -1022,8 +1022,8 @@ void String::print(String *str) case '\r': str->append(STRING_WITH_LEN("\\r")); break; - case 26: //Ctrl-Z - str->append(STRING_WITH_LEN("\\z")); + case '\032': // Ctrl-Z + str->append(STRING_WITH_LEN("\\Z")); break; default: str->append(c); |