diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-04-07 15:23:05 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-04-07 15:23:05 +0300 |
| commit | 0948f9769b3e3da2e064e65015b86644af4acd78 (patch) | |
| tree | c7d0df7f0334621904d6713b3ea5f4ba1c9cefbe /sql/sql_prepare.cc | |
| parent | 08594c4795d9e673f8f514142489ce01954deba5 (diff) | |
| parent | 91fb27a3ca13beffcfec0fef93f12c580bad260f (diff) | |
| download | mariadb-git-0948f9769b3e3da2e064e65015b86644af4acd78.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
mysql-test/r/union.result:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 2b1adbf7afc..8072b151c5c 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -802,7 +802,7 @@ static int mysql_test_select_fields(Prepared_statement *stmt, if (check_table_access(thd, privilege, tables,0)) DBUG_RETURN(1); } - else if (check_access(thd, privilege, "*any*",0,0,0)) + else if (check_access(thd, privilege, any_db,0,0,0)) DBUG_RETURN(1); #endif if ((&lex->select_lex != lex->all_selects_list && @@ -1123,9 +1123,10 @@ static void reset_stmt_for_execute(Prepared_statement *stmt) void mysql_stmt_execute(THD *thd, char *packet, uint packet_length) { ulong stmt_id= uint4korr(packet); +#ifndef EMBEDDED_LIBRARY uchar *packet_end= (uchar *) packet + packet_length - 1; +#endif Prepared_statement *stmt; - DBUG_ENTER("mysql_stmt_execute"); packet+= 9; /* stmt_id + 5 bytes of flags */ |