diff options
| author | unknown <brian@zim.(none)> | 2006-03-09 17:06:04 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-03-09 17:06:04 -0800 |
| commit | 8c3b4b14f1f8e92d978c7cd5d12f2d774d1c5159 (patch) | |
| tree | 7ea3c61472ebb086c4b7ae9dc8224929e58e1743 /sql/sql_trigger.cc | |
| parent | f8e16cfb7830d2a23c98d949e5dd8542037a61ec (diff) | |
| parent | 696367399bd1013b5db7701659117dde9297f08c (diff) | |
| download | mariadb-git-8c3b4b14f1f8e92d978c7cd5d12f2d774d1c5159.tar.gz | |
Merge zim.(none):/home/brian/mysql/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.1-new
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
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 4cd7c65bab0..f1ecae884d5 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" @@ -928,7 +929,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. |