diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-09-28 10:36:04 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-09-28 10:36:04 +0200 |
| commit | 70255e85094e27597de49c404a867ad48b7e7bc3 (patch) | |
| tree | bcfe3c1689f5158834701b1dd5acdb6ccfe1b3b9 /sql/mysql_priv.h | |
| parent | c316933e602dbd8144e13254bc517f4e108032c3 (diff) | |
| parent | ca5e29475c8ae52035214c710be04bcb1ed13177 (diff) | |
| download | mariadb-git-70255e85094e27597de49c404a867ad48b7e7bc3.tar.gz | |
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 2c8c7d7cc00..ff04022b110 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -446,7 +446,8 @@ enum enum_parsing_place NO_MATTER, IN_HAVING, SELECT_LIST, - IN_WHERE + IN_WHERE, + IN_ON }; struct st_table; |