summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authordlenev@mockturtle.local <>2006-10-02 22:53:10 +0400
committerdlenev@mockturtle.local <>2006-10-02 22:53:10 +0400
commit8eb4401c5948f6e25e6d9894244d0d8eeea7e652 (patch)
tree5bb148bebab77a9d2565aed7985b1dd0c5d3f41d /sql/mysql_priv.h
parentf732270e5bc0de6a4fe768a85a72c84136739452 (diff)
parentd74621142bc184cd92433ad0872cd2c511791ac9 (diff)
downloadmariadb-git-8eb4401c5948f6e25e6d9894244d0d8eeea7e652.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 11f6375ebe0..c6cc6519d78 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;