diff options
| author | unknown <dlenev@mysql.com> | 2004-09-08 13:29:21 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-09-08 13:29:21 +0400 |
| commit | cab6f8df6ddb35fbdef771eb56217bb0920be25b (patch) | |
| tree | a103ef36c1230a085165269c481e5e135b27550d /sql/mysql_priv.h | |
| parent | 9243aa9ebe800724497316a8eb1bbab1d1065db6 (diff) | |
| parent | 52ac4935e7e00218bf7abde7b841a2e5111cc819 (diff) | |
| download | mariadb-git-cab6f8df6ddb35fbdef771eb56217bb0920be25b.tar.gz | |
Merge of changes from the main tree to tree for WL#1218 "Triggers".
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/parse_file.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
include/mysqld_error.h:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/share/czech/errmsg.txt:
Manual merge.
sql/share/danish/errmsg.txt:
Manual merge.
sql/share/dutch/errmsg.txt:
Manual merge.
sql/share/english/errmsg.txt:
Manual merge.
sql/share/estonian/errmsg.txt:
Manual merge.
sql/share/french/errmsg.txt:
Manual merge.
sql/share/german/errmsg.txt:
Manual merge.
sql/share/greek/errmsg.txt:
Manual merge.
sql/share/hungarian/errmsg.txt:
Manual merge.
sql/share/italian/errmsg.txt:
Manual merge.
sql/share/japanese/errmsg.txt:
Manual merge.
sql/share/korean/errmsg.txt:
Manual merge.
sql/share/norwegian-ny/errmsg.txt:
Manual merge.
sql/share/norwegian/errmsg.txt:
Manual merge.
sql/share/polish/errmsg.txt:
Manual merge.
sql/share/portuguese/errmsg.txt:
Manual merge.
sql/share/romanian/errmsg.txt:
Manual merge.
sql/share/russian/errmsg.txt:
Manual merge.
sql/share/serbian/errmsg.txt:
Manual merge.
sql/share/slovak/errmsg.txt:
Manual merge.
sql/share/spanish/errmsg.txt:
Manual merge.
sql/share/swedish/errmsg.txt:
Manual merge.
sql/share/ukrainian/errmsg.txt:
Manual merge.
sql/sp_head.cc:
Manual merge.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index a100aa0cd3a..84370d94f47 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -472,6 +472,7 @@ int mysql_rm_table_part2_with_lock(THD *thd, TABLE_LIST *tables, bool log_query); int quick_rm_table(enum db_type base,const char *db, const char *table_name); +void close_cached_table(THD *thd, TABLE *table); bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list); bool mysql_change_db(THD *thd,const char *name); void mysql_parse(THD *thd,char *inBuf,uint length); @@ -612,6 +613,7 @@ int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds); int mysql_delete(THD *thd, TABLE_LIST *table, COND *conds, SQL_LIST *order, ha_rows rows, ulong options); int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok=0); +int mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create); TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update); TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT* mem, bool *refresh); @@ -640,6 +642,10 @@ find_field_in_table(THD *thd, TABLE_LIST *table_list, bool check_grants_table, bool check_grants_view, bool allow_rowid, uint *cached_field_index_ptr); +Field * +find_field_in_real_table(THD *thd, TABLE *table, const char *name, + uint length, bool check_grants, bool allow_rowid, + uint *cached_field_index_ptr); #ifdef HAVE_OPENSSL #include <openssl/des.h> struct st_des_keyblock |