diff options
| author | monty@work.mysql.com <> | 2001-10-07 13:31:12 +0200 |
|---|---|---|
| committer | monty@work.mysql.com <> | 2001-10-07 13:31:12 +0200 |
| commit | 0c81c7ea07b8f28746fef96409eafb6995c5d7c9 (patch) | |
| tree | 8de068daf5e359d543ae605769aeb6792dfdbd0d /sql | |
| parent | a17173c74d7162820edddd3e240c333f433643f9 (diff) | |
| parent | 88e5ee018478318cd3c32744587f2b8a08638973 (diff) | |
| download | mariadb-git-0c81c7ea07b8f28746fef96409eafb6995c5d7c9.tar.gz | |
Merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_lex.cc | 2 | ||||
| -rw-r--r-- | sql/sql_lex.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index c3f98713c45..81464053cd4 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -147,7 +147,7 @@ LEX *lex_start(THD *thd, uchar *buf,uint length) lex->select->in_sum_expr=0; lex->select->expr_list.empty(); lex->select->ftfunc_list.empty(); - lex->convert_set=(lex->thd=thd)->convert_set; + lex->convert_set=thd->convert_set; lex->yacc_yyss=lex->yacc_yyvs=0; lex->ignore_space=test(thd->sql_mode & MODE_IGNORE_SPACE); return lex; diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 6ccb0a6b059..3121f453974 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -168,7 +168,6 @@ typedef struct st_lex { CONVERT *convert_set; LEX_USER *grant_user; gptr yacc_yyss,yacc_yyvs; - THD *thd; udf_func udf; HA_CHECK_OPT check_opt; // check/repair options HA_CREATE_INFO create_info; |