summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2018-04-28 08:49:07 +0400
committerAlexander Barkov <bar@mariadb.com>2018-04-28 08:49:07 +0400
commit9df0eab32792adb436a3fda82b175b82f4d6b393 (patch)
tree1ec53213eccc1319e2445847baf7d143d07fd63a
parent96a301bbbe5713fc0f1a79a80e29d7733e9e5966 (diff)
downloadmariadb-git-9df0eab32792adb436a3fda82b175b82f4d6b393.tar.gz
Cleanup for MDEV-16020 (fixing compilation failure on Windows)
-rw-r--r--sql/sql_lex.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index dd15f69e619..968c3767780 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -2075,7 +2075,7 @@ int Lex_input_stream::scan_ident_middle(THD *thd, Lex_ident_cli_st *str,
}
else
{
- is_8bit= (m_tok_start[0] & 0x80) | get_7bit_or_8bit_ident(thd, &c);
+ is_8bit= get_7bit_or_8bit_ident(thd, &c) || (m_tok_start[0] & 0x80);
resolve_introducer= !is_8bit;
}
length= yyLength();