summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2005-11-02 15:17:57 +0200
committerunknown <bell@sanja.is.com.ua>2005-11-02 15:17:57 +0200
commit3c76331f4cc22b9d2d2b8be08ed218532d700a35 (patch)
tree2ca2647ea453f761767de631fa8566d887a4fe86 /sql
parentb601d8f079c74aa9becdb853c5d386bea487695d (diff)
downloadmariadb-git-3c76331f4cc22b9d2d2b8be08ed218532d700a35.tar.gz
found problem removed
sql/sql_parse.cc: allow query_tables_own_last work correctly sql/table.cc: fixed returning value for libmysqld
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_parse.cc2
-rw-r--r--sql/table.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 51d655334f8..aab4caec5d4 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1767,6 +1767,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
/* Saved variable value */
my_bool old_innodb_table_locks=
IF_INNOBASE_DB(thd->variables.innodb_table_locks, FALSE);
+ /* used as fields initializator */
+ lex_start(thd, 0, 0);
statistic_increment(thd->status_var.com_stat[SQLCOM_SHOW_FIELDS],
diff --git a/sql/table.cc b/sql/table.cc
index 507e5e163d6..809787a9203 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -2538,11 +2538,11 @@ bool st_table_list::prepare_security(THD *thd)
tbl->table->grant= grant;
}
thd->security_ctx= save_security_ctx;
- DBUG_RETURN(FALSE);
#else
while ((tbl= tb++))
tbl->grant.privilege= ~NO_ACCESS;
#endif
+ DBUG_RETURN(FALSE);
}