diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-07-29 20:26:14 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-07-29 20:26:14 +0300 |
| commit | 29b230355da3eb1688f20ca8e802f7978692433a (patch) | |
| tree | 1295ba2d8bb4884a32ad11e02497332b62590669 /sql/sql_lex.cc | |
| parent | ca6c74b7ee8f9a1a94521083215601ef635f1db3 (diff) | |
| parent | ec1a433f087d09fd187d4a224394bfa87baa09ce (diff) | |
| download | mariadb-git-29b230355da3eb1688f20ca8e802f7978692433a.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 211377dcecb..7bdb1a45ad8 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -552,7 +552,7 @@ int yylex(void *arg, void *yythd) /* Note: "SELECT _bla AS 'alias'" _bla should be considered as a IDENT if charset haven't been found. - So we don't use MYF(MY_WME) with get_charset_by_name to avoid + So we don't use MYF(MY_WME) with get_charset_by_csname to avoid producing an error. */ |