diff options
| author | unknown <sergefp@mysql.com> | 2003-12-20 00:54:38 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2003-12-20 00:54:38 +0300 |
| commit | 0fe296b7b35e8382b896ff8d5d2d3f95fb93a0ae (patch) | |
| tree | 6f1ee123b4c43806a2d62ab70bfdc1402e51dff9 /sql/sql_lex.cc | |
| parent | 1d7dce3ca7e626ac1a358238fc7f09d4db41990a (diff) | |
| parent | c27cbe1dad595a5178c935e8aadfc828810fc2c0 (diff) | |
| download | mariadb-git-0fe296b7b35e8382b896ff8d5d2d3f95fb93a0ae.tar.gz | |
Merge mysql.com:/home/psergey/mysql-5.0-latest-pull
into mysql.com:/dbdata/psergey/mysql-5.0-imerge-unique
BitKeeper/etc/logging_ok:
auto-union
include/my_global.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/records.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/uniques.cc:
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 a67ee2385b9..b0381ae1d30 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -455,7 +455,7 @@ int yylex(void *arg, void *yythd) int tokval, result_state; uint length; enum my_lex_states state; - LEX *lex= (((THD *)yythd)->lex); + LEX *lex= ((THD *)yythd)->lex; YYSTYPE *yylval=(YYSTYPE*) arg; CHARSET_INFO *cs= ((THD *) yythd)->charset(); uchar *state_map= cs->state_map; |