diff options
author | unknown <bell@sanja.is.com.ua> | 2004-02-14 13:31:39 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-02-14 13:31:39 +0200 |
commit | 6826a55b1da73770ce067972efafc00f9d2f6670 (patch) | |
tree | 5a43e43d6a139a343cb71c89c1209240d9287db0 /sql/mysql_priv.h | |
parent | fab7113f8398ba41d5e54e32dc0b3259a6297dfc (diff) | |
parent | 4ec12a5e55d5f2db27a5c0ce93c7e74254d652a4 (diff) | |
download | mariadb-git-6826a55b1da73770ce067972efafc00f9d2f6670.tar.gz |
merge
sql/item.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 73cc8b9ce03..ed56924775e 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -764,6 +764,8 @@ uint find_type(TYPELIB *lib, const char *find, uint length, bool part_match); uint check_word(TYPELIB *lib, const char *val, const char *end, const char **end_of_word); +bool is_keyword(const char *name, uint len); + #define MY_DB_OPT_FILE "db.opt" bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create); |