diff options
| author | unknown <brian@zim.(none)> | 2006-03-09 16:44:08 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-03-09 16:44:08 -0800 |
| commit | 01d69c4b966015a7fc5806d337e3006b22baed47 (patch) | |
| tree | 407275d5a687e4a6876141135931177d388ddc23 /sql/sql_trigger.cc | |
| parent | 85d705b651cf9057f2d687294044f173880675c3 (diff) | |
| download | mariadb-git-01d69c4b966015a7fc5806d337e3006b22baed47.tar.gz | |
This patch does 1) fix my build breakage 2) Complete the removal of all symbols which could clash with another parser.
sql/mysql_priv.h:
Porting update
sql/mysqld.cc:
Porting update
sql/sp.cc:
Porting update
sql/sql_lex.cc:
Porting update
sql/sql_lex.h:
Porting update
sql/sql_parse.cc:
Porting update
sql/sql_prepare.cc:
Portinng update
sql/sql_trigger.cc:
Porting update
sql/sql_view.cc:
Porting update
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 024c882f8a9..b432961b7e6 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -15,6 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define MYSQL_LEX 1 #include "mysql_priv.h" #include "sp_head.h" #include "sql_trigger.h" @@ -932,7 +933,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, lex_start(thd, (uchar*)trg_create_str->str, trg_create_str->length); thd->spcont= 0; - if (yyparse((void *)thd) || thd->is_fatal_error) + if (MYSQLparse((void *)thd) || thd->is_fatal_error) { /* Free lex associated resources. |