diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-02 17:50:55 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-02 17:50:55 +0400 |
| commit | 6de3acece297e93c05281395232522fe8a60257b (patch) | |
| tree | 3662de642828825633db46ccebd552718618a3ef /sql/sql_prepare.cc | |
| parent | 84d0cda44c8fd13b3b88f7b90ec8fb755caef361 (diff) | |
| parent | 4a12418583b0527ea4f91c96de6e6991fdc45a15 (diff) | |
| download | mariadb-git-6de3acece297e93c05281395232522fe8a60257b.tar.gz | |
Merge mysql.com:/d2/hf/common/my41-common
into mysql.com:/d2/hf/common/my50-common
mysql-test/t/mysqladmin.test:
Auto merged
sql/item_func.cc:
Auto merged
libmysqld/lib_sql.cc:
merging
mysql-test/t/distinct.test:
merging
sql/sql_prepare.cc:
SCCS merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 7f8239c654b..e9f33a172c4 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1252,7 +1252,6 @@ static int mysql_test_select(Prepared_statement *stmt, lex->select_lex.context.resolve_in_select_list= TRUE; -#ifndef NO_EMBEDDED_ACCESS_CHECKS ulong privilege= lex->exchange ? SELECT_ACL | FILE_ACL : SELECT_ACL; if (tables) { @@ -1261,7 +1260,6 @@ static int mysql_test_select(Prepared_statement *stmt, } else if (check_access(thd, privilege, any_db,0,0,0,0)) goto error; -#endif if (!lex->result && !(lex->result= new (stmt->mem_root) select_send)) { |