diff options
| author | unknown <tsmith@maint2.mysql.com> | 2006-09-01 08:53:56 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint2.mysql.com> | 2006-09-01 08:53:56 +0200 |
| commit | 5bd9bf5572a2c7aa917cdeee2b116646953b2e69 (patch) | |
| tree | 24b6f3aba8a9ade97a4fbce85a8c990afbe49db7 /sql/sql_lex.cc | |
| parent | 5992281da6978f747434963fde2d4b5836d4b5bd (diff) | |
| parent | 5576ed8b1e7b12087f50056ca7eb397096be6b33 (diff) | |
| download | mariadb-git-5bd9bf5572a2c7aa917cdeee2b116646953b2e69.tar.gz | |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/41
into maint2.mysql.com:/data/localhome/tsmith/bk/50
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
vio/viosocket.c:
Auto merged
client/mysql.cc:
Manual merge.
mysql-test/t/ctype_recoding.test:
Manual merge.
sql/sql_lex.h:
SCCS merged
sql/sql_table.cc:
Manual merge.
mysql-test/r/ctype_recoding.result:
Manual merge
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 5e13cade716..2f0bcd09d14 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -654,8 +654,9 @@ int MYSQLlex(void *arg, void *yythd) */ if ((yylval->lex_str.str[0]=='_') && - (lex->charset=get_charset_by_csname(yylval->lex_str.str+1, - MY_CS_PRIMARY,MYF(0)))) + (lex->underscore_charset= + get_charset_by_csname(yylval->lex_str.str + 1, + MY_CS_PRIMARY,MYF(0)))) return(UNDERSCORE_CHARSET); return(result_state); // IDENT or IDENT_QUOTED |