diff options
| author | monty@mashka.mysql.fi <> | 2002-10-03 16:56:09 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-10-03 16:56:09 +0300 |
| commit | 2e52a69b12f8787250d9664ba82f99daba022cab (patch) | |
| tree | 32ad2b453c07e081d1b3b23780b839058042626d /sql/sql_lex.cc | |
| parent | 62a26cf891fdf4372e7773db3c413f0b7627910d (diff) | |
| parent | 70ee4943ded0589a9a14794ea5f1be021406f1a8 (diff) | |
| download | mariadb-git-2e52a69b12f8787250d9664ba82f99daba022cab.tar.gz | |
Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index a8e9bfb1757..6ee1164806d 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -142,11 +142,11 @@ LEX *lex_start(THD *thd, uchar *buf,uint length) lex->next_state=STATE_START; lex->end_of_query=(lex->ptr=buf)+length; lex->yylineno = 1; - lex->select->create_refs=lex->in_comment=0; + lex->select_lex.create_refs=lex->in_comment=0; lex->length=0; - lex->select->in_sum_expr=0; - lex->select->expr_list.empty(); - lex->select->ftfunc_list.empty(); + lex->select_lex.in_sum_expr=0; + lex->select_lex.expr_list.empty(); + lex->select_lex.ftfunc_list.empty(); lex->convert_set=(lex->thd=thd)->variables.convert_set; lex->yacc_yyss=lex->yacc_yyvs=0; lex->ignore_space=test(thd->sql_mode & MODE_IGNORE_SPACE); @@ -158,7 +158,7 @@ LEX *lex_start(THD *thd, uchar *buf,uint length) void lex_end(LEX *lex) { - lex->select->expr_list.delete_elements(); // If error when parsing sql-varargs + lex->select_lex.expr_list.delete_elements(); // If error when parsing sql-varargs x_free(lex->yacc_yyss); x_free(lex->yacc_yyvs); } |