diff options
| author | unknown <monty@mysql.com> | 2005-11-02 16:29:00 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-11-02 16:29:00 +0200 |
| commit | 7d49eca96b8119d9ff0cb26bb3093d05ba1cf90e (patch) | |
| tree | 46102e04c641433009a48a090849e508eb385fa7 /sql/table.cc | |
| parent | 3c76331f4cc22b9d2d2b8be08ed218532d700a35 (diff) | |
| parent | 4e2b6133b68a168df1f9c4f7aef056abbd97928b (diff) | |
| download | mariadb-git-7d49eca96b8119d9ff0cb26bb3093d05ba1cf90e.tar.gz | |
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/my/mysql-5.0
sql/item_func.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 809787a9203..dd6018b70f3 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2511,9 +2511,9 @@ bool st_table_list::prepare_security(THD *thd) { List_iterator_fast<TABLE_LIST> tb(*view_tables); TABLE_LIST *tbl; + DBUG_ENTER("st_table_list::prepare_security"); #ifndef NO_EMBEDDED_ACCESS_CHECKS Security_context *save_security_ctx= thd->security_ctx; - DBUG_ENTER("st_table_list::prepare_security"); DBUG_ASSERT(!prelocking_placeholder); if (prepare_view_securety_context(thd)) |