diff options
| author | unknown <jimw@mysql.com> | 2005-02-07 12:20:08 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-02-07 12:20:08 -0800 |
| commit | 7814366660c9dc5fa210e4b74d837aa87da1488e (patch) | |
| tree | 540f7542464f7ded08389366a486a1f19a89c986 /sql/sql_lex.cc | |
| parent | 9c99d6b267944f2282469c793426057cb9eddba8 (diff) | |
| parent | 3443fdf954dbe604db66386711ba3e36116beba0 (diff) | |
| download | mariadb-git-7814366660c9dc5fa210e4b74d837aa87da1488e.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-6368
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/sql_lex.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 0644ca5af68..b8c77a822c4 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -337,7 +337,8 @@ static char *get_text(LEX *lex) continue; } #endif - if (*str == '\\' && str+1 != end) + if (!(lex->thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) && + *str == '\\' && str+1 != end) { switch(*++str) { case 'n': |